From 268f139c0a33401d0726f0bd41cbc38f0472a310 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 17 十月 2025 13:42:06 +0800
Subject: [PATCH] 1

---
 WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html                    |   70 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user                  |  218 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_OtherInBillList.aspx.cs           |   17 
 WebTM/views/WMS扫码模块/库存转移/kf_InventoryTransfer.html                  |   12 
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html                      |   38 
 WebTM/views/index_Mobile.html                                       |    2 
 WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html                       |   15 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html                 |   55 
 WebTM/views/生产管理/异常反馈单/OA_ErrMsgBackHandleBillMain.html             |    4 
 WebTM/views/index_QiaoYi.html                                       |    8 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html                  |  299 
 WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList2.html             |    3 
 WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam.html          |   50 
 WebTM/layuiadmin/dayjs.min.js                                       |    1 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                           |    2 
 WebTM/views/基础资料/生产基础资料/Gy_ShiftsEdit.html                          |  124 
 WebTM/views/仓存管理/条码报表/Kf_ICInventory_Cus.html                       |    2 
 WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList_TestByLLJ.html | 3137 ++++++++++
 WebTM/views/质量管理/来料检验单/QC_POStockInCheckBillList.html               |  343 
 WebTM/views/WMS扫码模块/产量汇报/Sc_ICMOBillWorkQtyStatus_PDA.html          |  198 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBillList_v2.html          |  338 
 WebTM/views/应收管理/报表分析/Xs_CusShouGongChaoBaoReport.html              |   72 
 WebTM/views/验收入库/其他入库/Kf_OtherInBillList.html                       |   26 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_OtherInBillList.aspx.designer.cs  |   26 
 WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_YangMao.html               |   16 
 WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html                     |   79 
 WebTM/layuiadmin/HideButton_New.js                                  |    6 
 WebTM/views/模治具管理/模治具管理/Gy_BarCodeBillList_JiaNan.html              |  109 
 WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html                       |    9 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html                            |   77 
 WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBill_PDA.html            |  964 +-
 WebTM/views/基础资料/生产基础资料/Gy_ShiftsList.html                          |   27 
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html      |   24 
 WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_TK.html            |  529 +
 WebTM/layuiadmin/Scripts/webConfig2.js                              |   14 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillQuery.html                      |   93 
 WebTM/views/应收管理/报表分析/Xs_CusShouGongChaoBaoSumReport.html           | 1087 +++
 WebTM/views/WMS扫码模块/生产管理/删托单/Sc_DeletePackUnionBill_PDA.html        |  538 +
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html       |  141 
 WebTM/views/生产管理/异常反馈单/Sc_MESExecptFeedBackBillList.html            |    6 
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html   |    1 
 WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html            |  246 
 WebTM/layuiadmin/Scripts/webConfig.js                               |    6 
 WebTM/WebTM.csproj                                                  |   13 
 WebTM/App_Data/MssqlReportData.cs                                   |    3 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html                  |   32 
 WebTM/views/基础资料/生产基础资料/Gy_Process.html                             |    5 
 WebTM/views/车间管理/产线/RetrospectionCustomerReport.html                |  187 
 WebTM/views/基础资料/生产基础资料/Gy_Source.html                              |    4 
 WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckOtherBillList.html         |   14 
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBill.html          |    1 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList2.html                |    3 
 WebTM/views/仓存管理/条码报表/Kf_ICInventory_Cus_Emp.html                   | 1036 +++
 WebTM/views/领料发货/销售出库/Kf_SellOutBillList_YP.html                    |   10 
 WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html                | 2844 +++++----
 WebTM/views/案例代码/华远/HY_HistogramReport.html                         |  119 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill_v2.html              |   10 
 WebTM/views/home/console_Mobile.html                                |   18 
 WebTM/views/领料发货/领料出库/Kf_MateOutBillEdit_MaoJian.html               |   33 
 WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam_Temp.html     |   48 
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                     |   52 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_JiaNan.html                    |    6 
 WebTM/views/生产管理/组装单/Sc_GroupOrderBillList.html                     |    6 
 WebTM/views/车间管理/报表分析/sc_ICOMReport.html                            |    8 
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                          |    9 
 WebTM/views/设备管理/Sb_EqpConkBookBillList.html                        |   35 
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html                      |   71 
 WebTM/WebTM.csproj.user                                             |    4 
 WebTM/views/车间管理/产线/Sc_GroupOrderBillList.html                      |   12 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html                       |    2 
 WebTM/views/验收入库/外购入库/Kf_POStockInBackBillList.html                 |   37 
 WebTM/views/仓存管理/条码生成/Gy_BarCodeBill_JiaNan_AutoLogin.html          |    8 
 WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html                    |    7 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Kf_OtherInBillList.aspx              |   28 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html                 |    4 
 WebTM/views/车间管理/产线/MES_BarcodeWhiteLabelReport.html                |    4 
 WebTM/layuiadmin/SetColumn.js                                       |   15 
 WebTM/views/验收入库/其他入库/Add_Edit_Kf_OtherInBill.html                  | 2116 ++++--
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                           |    2 
 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html       |   20 
 WebTM/views/车间管理/产线/MES_ProductionLinePackagingList.html            |   80 
 WebTM/views/生产管理/生产计划平台/Sc_ICMOSortBillList.html                    |    1 
 WebTM/views/领料发货/其他出库/Add_Edit_Kf_OtherOutBill.html                 | 2114 ++++--
 WebTM/views/WMS扫码模块/生产管理/生产组托单/Sc_PackUnionBillList_PDA.html        |  328 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                         |   67 
 85 files changed, 13,699 insertions(+), 4,749 deletions(-)

diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index 0d5335c..e498c11 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -37,6 +37,7 @@
     //public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//鑸滄垚
     //public const string SqlConnStr = "Data Source=172.16.1.89;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//杩﹀崡
     //public const string SqlConnStr = "Data Source=172.16.1.30;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//娴疯瘹
+    public const string SqlConnStr = "Data Source=172.16.20.60; Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//灏忓崼
 
     //public string sServer;
     //public string sDataBase;
@@ -98,7 +99,7 @@
         ReportConn.Open();
         ReportDataAdapter.Fill(ReportDataSet);
         ReportConn.Close();
-        LogService.Write("SqlConnStr:"+ SqlConnStr);
+        LogService.Write("SqlConnStr:" + SqlConnStr);
         LogService.Write("ReportDataSet:" + ReportDataSet.Tables[0].Rows.Count);
 
         if (IsJSON)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 2d26f18..7486338 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
-    <History>True|2025-09-15T05:43:02.7194840Z;True|2025-09-15T12:43:41.8299278+08:00;False|2025-09-15T12:43:16.3202892+08:00;True|2025-09-14T20:52:09.3599497+08:00;False|2025-09-14T20:51:55.5551910+08:00;True|2025-09-14T16:35:56.4267213+08:00;True|2025-09-14T16:10:35.4507582+08:00;True|2025-09-14T16:04:30.0969247+08:00;True|2025-09-14T16:03:46.0958639+08:00;True|2025-09-14T16:01:52.5082969+08:00;True|2025-09-14T15:12:07.0239617+08:00;True|2025-09-14T14:55:31.3810881+08:00;False|2025-09-14T13:41:00.1248761+08:00;False|2025-09-12T09:12:36.1841750+08:00;True|2025-09-11T10:28:59.5711340+08:00;False|2025-09-11T10:28:29.0428624+08:00;True|2025-09-10T10:13:31.1270766+08:00;True|2025-09-10T09:36:50.3578377+08:00;False|2025-09-10T09:36:20.6920631+08:00;True|2025-09-08T09:40:08.0905332+08:00;False|2025-09-08T09:39:51.3125449+08:00;True|2025-09-05T15:38:09.2320346+08:00;True|2025-09-05T15:27:54.0459013+08:00;False|2025-09-05T15:27:44.7828443+08:00;True|2025-09-04T17:06:55.5968659+08:00;True|2025-09-04T17:05:18.9087838+08:00;True|2025-09-04T15:19:29.4095578+08:00;False|2025-09-04T15:19:02.5866931+08:00;True|2025-09-03T15:51:28.9030672+08:00;True|2025-09-03T15:50:23.6292004+08:00;True|2025-09-03T15:49:09.2787247+08:00;True|2025-09-03T15:37:43.1319700+08:00;True|2025-09-03T15:02:42.8547695+08:00;True|2025-09-03T13:59:23.7496636+08:00;False|2025-09-03T13:58:55.4054677+08:00;True|2025-09-02T14:17:50.6091123+08:00;True|2025-09-02T13:40:51.7669061+08:00;False|2025-09-02T13:40:13.3546740+08:00;False|2025-09-02T13:38:48.5403592+08:00;False|2025-09-02T13:37:59.6191295+08:00;False|2025-09-02T13:37:32.6098133+08:00;False|2025-09-02T13:37:12.0832669+08:00;True|2025-08-21T13:25:47.4858992+08:00;False|2025-08-21T13:25:32.4156686+08:00;True|2025-08-19T16:07:39.0889263+08:00;True|2025-08-19T16:07:20.3364203+08:00;False|2025-08-19T16:07:00.6078098+08:00;True|2025-08-15T13:33:04.6083649+08:00;False|2025-08-15T13:32:48.5596650+08:00;False|2025-08-14T11:07:04.9417057+08:00;True|2025-08-13T20:37:56.2729405+08:00;True|2025-08-13T20:27:46.2457492+08:00;False|2025-08-13T20:27:22.2365010+08:00;True|2025-08-13T17:38:47.4698629+08:00;True|2025-08-13T14:13:18.0867415+08:00;True|2025-08-13T14:10:53.5215303+08:00;False|2025-08-13T14:10:38.6533775+08:00;True|2025-08-08T14:45:38.8710223+08:00;True|2025-08-08T14:36:05.4506899+08:00;False|2025-08-08T14:35:49.2395019+08:00;True|2025-08-08T12:51:05.5753201+08:00;False|2025-08-08T12:50:41.8998290+08:00;True|2025-08-07T17:46:25.3848582+08:00;True|2025-08-07T14:41:24.7638189+08:00;False|2025-08-07T14:41:08.4966741+08:00;True|2025-08-07T13:18:45.4109538+08:00;False|2025-08-07T13:18:23.6541139+08:00;True|2025-08-06T14:48:29.1813368+08:00;False|2025-08-06T14:48:01.7497640+08:00;True|2025-07-31T11:31:26.9211602+08:00;True|2025-07-31T11:30:27.0395269+08:00;True|2025-07-31T11:20:53.3394769+08:00;True|2025-07-31T11:20:15.7759103+08:00;True|2025-07-31T11:16:57.3823431+08:00;True|2025-07-31T11:05:05.9382499+08:00;True|2025-07-31T10:53:29.9296027+08:00;True|2025-07-31T10:50:29.6294739+08:00;True|2025-07-31T09:38:12.2534472+08:00;True|2025-07-31T09:36:26.1364414+08:00;True|2025-07-31T09:09:38.4479829+08:00;True|2025-07-31T09:01:56.6376393+08:00;True|2025-07-31T08:57:38.0151708+08:00;False|2025-07-31T08:57:19.7029116+08:00;True|2025-07-30T13:59:10.3846558+08:00;True|2025-07-30T13:57:28.7712713+08:00;True|2025-07-30T13:30:14.3755448+08:00;True|2025-07-30T12:47:57.3189783+08:00;True|2025-07-30T12:44:40.9257897+08:00;True|2025-07-30T12:44:26.3988519+08:00;True|2025-07-30T12:42:14.3621410+08:00;True|2025-07-30T12:37:47.5857800+08:00;True|2025-07-30T11:29:53.6303914+08:00;True|2025-07-30T11:23:36.6544326+08:00;True|2025-07-30T09:52:50.5539574+08:00;True|2025-07-30T09:51:43.0235088+08:00;False|2025-07-30T09:51:20.4585269+08:00;True|2025-07-29T18:14:57.7912495+08:00;True|2025-07-29T18:06:59.7432032+08:00;True|2025-07-29T18:06:21.4067333+08:00;True|2025-07-29T18:04:44.7727076+08:00;True|2025-07-29T18:03:16.6330864+08:00;True|2025-07-29T17:58:22.4884094+08:00;True|2025-07-29T17:51:17.4731594+08:00;True|2025-07-29T17:30:02.5175752+08:00;True|2025-07-29T17:22:51.2206869+08:00;True|2025-07-29T15:58:06.7872139+08:00;True|2025-07-29T15:52:25.6935664+08:00;False|2025-07-29T15:51:57.5197553+08:00;True|2025-07-28T17:33:18.1495336+08:00;True|2025-07-28T15:04:36.1888394+08:00;True|2025-07-28T14:19:20.1483024+08:00;True|2025-07-28T14:13:33.0338382+08:00;True|2025-07-28T14:06:02.4983388+08:00;False|2025-07-28T14:05:44.8336761+08:00;False|2025-07-26T12:52:08.1302577+08:00;True|2025-07-25T18:16:22.4916372+08:00;True|2025-07-25T18:10:03.8748246+08:00;True|2025-07-25T18:09:20.6646310+08:00;True|2025-07-25T18:05:24.3772735+08:00;True|2025-07-25T17:56:03.7506046+08:00;True|2025-07-25T17:51:18.4125686+08:00;True|2025-07-25T14:26:44.2546206+08:00;False|2025-07-25T14:26:12.6493026+08:00;True|2025-07-16T19:29:27.0515947+08:00;True|2025-07-16T19:20:01.1132696+08:00;True|2025-07-16T19:16:14.3793010+08:00;True|2025-07-16T19:13:05.0534366+08:00;False|2025-07-16T19:12:48.7636107+08:00;True|2025-07-16T09:21:13.4303928+08:00;True|2025-07-16T09:17:35.4522435+08:00;False|2025-07-16T09:17:13.5076021+08:00;True|2025-07-15T16:57:08.8718036+08:00;False|2025-07-15T16:56:49.7095589+08:00;True|2025-07-10T17:26:30.2500808+08:00;True|2025-07-10T15:05:35.1960737+08:00;False|2025-07-10T15:05:24.5526075+08:00;True|2025-07-09T18:07:52.8307734+08:00;False|2025-07-09T18:07:32.9729733+08:00;True|2025-07-08T09:05:02.3758956+08:00;False|2025-07-08T09:04:45.0633912+08:00;True|2025-07-07T18:57:42.4794642+08:00;True|2025-07-07T18:45:14.4070657+08:00;False|2025-07-07T18:44:22.9506493+08:00;True|2025-07-01T11:37:30.2505294+08:00;True|2025-07-01T11:34:58.9780159+08:00;True|2025-07-01T11:30:55.9731169+08:00;True|2025-07-01T10:50:40.9750731+08:00;True|2025-07-01T10:49:29.5040084+08:00;True|2025-07-01T10:47:32.5577113+08:00;True|2025-07-01T10:45:01.5920641+08:00;False|2025-07-01T10:44:36.2906054+08:00;True|2025-06-30T20:20:37.5108405+08:00;True|2025-06-30T20:18:18.1141382+08:00;False|2025-06-30T20:17:50.2618215+08:00;True|2025-06-30T17:08:40.2046600+08:00;True|2025-06-30T14:13:27.9276170+08:00;False|2025-06-30T14:13:08.2955829+08:00;True|2025-06-26T14:59:37.9432510+08:00;False|2025-06-26T14:59:27.7120940+08:00;True|2025-06-25T10:08:11.5435336+08:00;True|2025-06-25T09:48:15.6545862+08:00;True|2025-06-25T09:17:39.4282829+08:00;False|2025-06-25T09:17:06.1173641+08:00;True|2025-06-24T14:24:24.8608110+08:00;True|2025-06-24T13:29:41.8846061+08:00;True|2025-06-24T11:40:24.7114753+08:00;True|2025-06-24T11:38:39.9925984+08:00;True|2025-06-24T11:31:43.1414921+08:00;True|2025-06-24T11:29:18.2941264+08:00;True|2025-06-24T11:14:30.3743100+08:00;True|2025-06-24T11:13:48.7680482+08:00;True|2025-06-24T11:09:58.5968569+08:00;True|2025-06-24T11:08:08.7682780+08:00;True|2025-06-24T10:37:50.2746842+08:00;True|2025-06-24T10:04:21.1792934+08:00;True|2025-06-24T09:38:18.3176776+08:00;True|2025-06-24T09:34:50.3708868+08:00;False|2025-06-24T09:34:26.4728698+08:00;True|2025-06-23T17:05:32.5796810+08:00;True|2025-06-23T17:04:05.0688937+08:00;True|2025-06-23T13:59:19.2688884+08:00;True|2025-06-23T11:29:10.3814551+08:00;True|2025-06-23T11:19:54.5044517+08:00;True|2025-06-23T11:05:38.5603293+08:00;True|2025-06-23T10:57:03.6611727+08:00;True|2025-06-23T10:49:36.9130331+08:00;False|2025-06-23T10:49:18.5916897+08:00;True|2025-06-20T13:29:58.8176897+08:00;True|2025-06-20T13:15:43.7374949+08:00;False|2025-06-20T13:15:20.7432688+08:00;True|2025-06-19T21:46:29.0476990+08:00;True|2025-06-19T21:44:07.0255680+08:00;True|2025-06-19T21:40:54.8917004+08:00;True|2025-06-19T21:30:44.8729100+08:00;True|2025-06-19T21:17:13.9288647+08:00;True|2025-06-19T21:11:59.7332020+08:00;True|2025-06-19T21:10:46.7558553+08:00;True|2025-06-19T21:06:59.9821855+08:00;True|2025-06-19T20:57:42.2255608+08:00;True|2025-06-19T20:54:22.1485351+08:00;True|2025-06-19T20:53:39.4877170+08:00;True|2025-06-19T20:51:40.1134467+08:00;True|2025-06-19T20:50:06.2220331+08:00;True|2025-06-19T20:43:40.4300258+08:00;True|2025-06-19T20:43:28.4637040+08:00;True|2025-06-19T20:40:58.3939790+08:00;True|2025-06-19T20:38:18.1067206+08:00;True|2025-06-19T20:34:36.8473391+08:00;True|2025-06-19T20:31:08.0652635+08:00;True|2025-06-19T20:29:17.2962865+08:00;True|2025-06-19T20:25:12.9054302+08:00;True|2025-06-19T20:19:04.3290755+08:00;True|2025-06-19T20:10:38.1069948+08:00;True|2025-06-19T20:07:41.9318197+08:00;True|2025-06-19T20:05:31.8825704+08:00;True|2025-06-19T19:59:45.4008154+08:00;True|2025-06-19T19:57:44.1169317+08:00;True|2025-06-19T19:49:05.9273689+08:00;True|2025-06-19T19:21:38.1003970+08:00;True|2025-06-19T19:21:29.4057702+08:00;True|2025-06-19T19:20:49.9520871+08:00;False|2025-06-19T19:20:33.1351490+08:00;True|2025-06-19T17:47:11.8899733+08:00;True|2025-06-19T17:45:51.9461440+08:00;True|2025-06-19T17:42:40.4214364+08:00;True|2025-06-19T17:32:29.9585738+08:00;True|2025-06-19T17:31:57.7429273+08:00;True|2025-06-19T17:31:22.8039838+08:00;True|2025-06-19T16:44:04.9869169+08:00;False|2025-06-19T16:43:53.4308248+08:00;True|2025-06-17T12:44:47.9445980+08:00;True|2025-06-17T12:43:01.6173041+08:00;True|2025-06-17T12:39:35.7469432+08:00;True|2025-06-17T12:17:21.9820010+08:00;True|2025-06-17T11:56:26.7990171+08:00;True|2025-06-17T11:51:59.9444746+08:00;True|2025-06-17T11:50:10.5654966+08:00;True|2025-06-17T11:47:05.2216982+08:00;True|2025-06-17T11:38:52.7237953+08:00;False|2025-06-17T11:38:34.7222132+08:00;True|2025-06-16T19:04:02.3364713+08:00;False|2025-06-16T19:03:45.5930596+08:00;True|2025-06-10T16:19:31.0614174+08:00;True|2025-06-10T16:15:20.6430188+08:00;True|2025-06-10T13:15:38.2392519+08:00;True|2025-06-10T13:14:06.0141666+08:00;True|2025-06-10T13:10:57.3109515+08:00;False|2025-06-10T13:10:44.6334322+08:00;True|2025-06-09T14:19:19.3678350+08:00;True|2025-06-09T13:59:16.4472313+08:00;True|2025-06-09T13:44:59.6573868+08:00;False|2025-06-09T13:44:35.1189385+08:00;True|2025-06-06T14:38:53.2242596+08:00;False|2025-06-06T14:38:29.8735366+08:00;True|2025-06-04T20:53:59.2893402+08:00;False|2025-06-04T20:53:43.4073803+08:00;True|2025-06-03T14:29:52.2448301+08:00;True|2025-06-03T13:56:38.1301683+08:00;True|2025-06-03T13:38:56.7749508+08:00;True|2025-06-03T13:28:45.2901426+08:00;True|2025-06-03T13:27:57.6382388+08:00;True|2025-06-03T13:25:05.8249778+08:00;True|2025-06-03T13:20:50.3714171+08:00;True|2025-06-03T13:19:44.4918539+08:00;True|2025-06-03T13:16:57.8393576+08:00;True|2025-06-03T13:15:35.6020739+08:00;True|2025-06-03T09:29:22.1826197+08:00;True|2025-06-03T08:54:43.5376489+08:00;True|2025-06-03T08:48:51.2196179+08:00;False|2025-06-03T08:48:23.6531326+08:00;True|2025-05-30T19:14:33.1321659+08:00;True|2025-05-30T19:09:28.6321844+08:00;False|2025-05-30T19:09:10.9611020+08:00;True|2025-05-30T11:10:09.3804694+08:00;False|2025-05-30T11:09:38.9759833+08:00;True|2025-05-30T09:25:55.8349264+08:00;False|2025-05-30T09:25:33.7512390+08:00;True|2025-05-29T13:19:09.3041429+08:00;False|2025-05-29T13:18:52.3875953+08:00;True|2025-05-28T18:34:06.8273247+08:00;True|2025-05-28T18:31:05.4364474+08:00;True|2025-05-28T18:27:41.8513807+08:00;True|2025-05-28T18:20:47.6240772+08:00;False|2025-05-28T18:20:38.0301633+08:00;True|2025-05-28T15:45:55.3418948+08:00;True|2025-05-28T15:44:59.7156409+08:00;True|2025-05-28T15:43:03.0458642+08:00;True|2025-05-28T15:40:55.1488977+08:00;True|2025-05-28T15:25:49.1288443+08:00;True|2025-05-28T14:35:05.2561044+08:00;True|2025-05-28T09:39:05.7154902+08:00;False|2025-05-28T09:38:43.0839585+08:00;True|2025-05-26T19:34:53.6400925+08:00;True|2025-05-26T19:19:09.7485729+08:00;True|2025-05-26T19:16:13.4436032+08:00;True|2025-05-26T19:15:41.5587345+08:00;True|2025-05-26T19:13:28.2496521+08:00;True|2025-05-26T19:11:13.9374078+08:00;True|2025-05-26T19:08:26.7288220+08:00;True|2025-05-26T19:07:41.6174469+08:00;True|2025-05-26T19:07:17.8455284+08:00;True|2025-05-26T19:03:18.8383293+08:00;True|2025-05-26T19:02:38.1409352+08:00;True|2025-05-26T18:04:23.0851072+08:00;True|2025-05-26T18:00:37.9490175+08:00;True|2025-05-26T17:36:14.9186618+08:00;True|2025-05-26T17:04:56.2652242+08:00;True|2025-05-26T17:03:32.3788117+08:00;True|2025-05-26T17:01:11.8316740+08:00;True|2025-05-26T16:54:02.0120204+08:00;True|2025-05-26T16:50:36.6739590+08:00;True|2025-05-26T16:20:54.0793563+08:00;True|2025-05-26T16:19:13.4466564+08:00;True|2025-05-26T16:18:37.0522011+08:00;True|2025-05-26T16:10:07.6439971+08:00;True|2025-05-26T16:07:37.9881606+08:00;True|2025-05-26T15:58:45.5790885+08:00;True|2025-05-26T15:57:39.8957333+08:00;True|2025-05-26T15:56:04.5332484+08:00;True|2025-05-26T15:54:08.6770273+08:00;True|2025-05-26T15:51:31.9863077+08:00;True|2025-05-26T14:17:37.4566639+08:00;True|2025-05-26T14:14:45.6478856+08:00;True|2025-05-26T14:13:32.3061443+08:00;True|2025-05-26T14:09:53.7668953+08:00;True|2025-05-26T14:08:53.7195888+08:00;True|2025-05-26T14:06:33.9160028+08:00;True|2025-05-26T09:43:55.0924210+08:00;True|2025-05-26T09:17:54.8815561+08:00;False|2025-05-26T09:17:46.0326457+08:00;True|2025-05-23T10:23:17.1057955+08:00;True|2025-05-23T10:22:31.7938776+08:00;False|2025-05-23T10:22:01.3464796+08:00;False|2025-05-23T10:21:56.8447978+08:00;True|2025-05-23T10:04:53.2423852+08:00;False|2025-05-23T10:04:21.9568682+08:00;True|2025-05-22T13:39:26.7824978+08:00;True|2025-05-22T12:19:49.9134386+08:00;False|2025-05-22T12:18:56.4955831+08:00;True|2025-05-22T09:31:52.8998426+08:00;False|2025-05-22T09:31:31.5103211+08:00;True|2025-05-21T21:36:19.8162653+08:00;True|2025-05-21T21:33:04.3951416+08:00;True|2025-05-21T21:31:06.3835951+08:00;True|2025-05-21T21:27:11.7590428+08:00;False|2025-05-21T21:26:18.2096217+08:00;True|2025-05-21T10:13:15.7576895+08:00;True|2025-05-21T10:08:35.9305095+08:00;False|2025-05-21T10:08:06.4393322+08:00;True|2025-05-20T20:52:06.7190772+08:00;False|2025-05-20T20:51:27.6441551+08:00;True|2025-05-20T10:50:39.3347667+08:00;True|2025-05-20T10:47:24.1628977+08:00;True|2025-05-20T10:42:22.4420459+08:00;True|2025-05-20T10:32:16.8802462+08:00;True|2025-05-20T10:20:12.5700338+08:00;False|2025-05-20T10:19:04.0954824+08:00;True|2025-05-19T10:08:49.0227698+08:00;True|2025-05-19T10:07:02.6110035+08:00;True|2025-05-19T10:05:49.7223902+08:00;True|2025-05-19T09:59:20.9398247+08:00;True|2025-05-19T09:58:31.8629178+08:00;False|2025-05-19T09:57:34.9251908+08:00;True|2025-05-17T12:01:30.1645467+08:00;True|2025-05-17T12:00:32.2339947+08:00;True|2025-05-17T11:55:19.4680460+08:00;True|2025-05-17T11:30:39.9716640+08:00;True|2025-05-17T11:24:41.2103791+08:00;False|2025-05-17T11:24:01.4177591+08:00;True|2025-05-16T16:04:53.4865079+08:00;True|2025-05-16T16:01:42.2978627+08:00;True|2025-05-16T15:59:07.5525777+08:00;True|2025-05-16T12:53:01.9848534+08:00;False|2025-05-16T12:52:37.5899807+08:00;True|2025-05-15T20:18:19.1959577+08:00;True|2025-05-15T20:16:31.3601343+08:00;False|2025-05-15T20:16:14.8877379+08:00;True|2025-05-15T17:13:41.3961273+08:00;True|2025-05-15T16:51:14.1735434+08:00;True|2025-05-15T16:40:38.1341678+08:00;True|2025-05-15T16:23:55.7504003+08:00;True|2025-05-15T15:39:08.0682854+08:00;True|2025-05-15T14:13:21.2837860+08:00;True|2025-05-15T13:36:02.4058882+08:00;True|2025-05-15T13:28:29.8243952+08:00;True|2025-05-15T10:26:14.6137519+08:00;True|2025-05-15T10:21:16.4378162+08:00;False|2025-05-15T10:20:39.3117941+08:00;False|2025-05-14T12:58:11.4083857+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
+    <History>True|2025-10-09T07:43:21.8621182Z;False|2025-10-09T15:43:07.2600155+08:00;True|2025-10-07T23:04:35.2397704+08:00;False|2025-10-07T23:04:10.4706265+08:00;True|2025-09-28T09:24:29.0608591+08:00;True|2025-09-28T09:24:08.1555675+08:00;False|2025-09-28T09:23:37.9953809+08:00;True|2025-09-24T13:20:41.7630136+08:00;True|2025-09-24T13:08:47.9053398+08:00;False|2025-09-24T13:08:22.6986901+08:00;True|2025-09-21T15:31:27.7649877+08:00;False|2025-09-21T15:31:15.2147206+08:00;True|2025-09-20T11:54:14.1855999+08:00;True|2025-09-20T11:48:45.9925548+08:00;False|2025-09-20T11:48:33.9131018+08:00;True|2025-09-19T16:36:35.6353404+08:00;True|2025-09-19T16:33:44.0748704+08:00;True|2025-09-19T16:20:15.9184069+08:00;True|2025-09-19T16:18:32.6231345+08:00;True|2025-09-19T16:09:33.7546268+08:00;True|2025-09-19T16:07:13.0937562+08:00;True|2025-09-19T16:04:51.9894822+08:00;True|2025-09-19T16:02:41.2176918+08:00;True|2025-09-19T16:01:47.3472075+08:00;True|2025-09-19T15:59:59.9136845+08:00;True|2025-09-19T15:57:30.2055253+08:00;True|2025-09-19T15:44:09.8299759+08:00;True|2025-09-19T15:10:41.1911815+08:00;True|2025-09-19T15:10:17.6971176+08:00;True|2025-09-19T15:07:56.9882944+08:00;True|2025-09-19T15:05:06.6782885+08:00;True|2025-09-19T15:03:19.3977041+08:00;True|2025-09-19T14:55:51.8630332+08:00;True|2025-09-19T14:52:59.2129683+08:00;False|2025-09-19T14:52:32.3087506+08:00;True|2025-09-18T10:35:30.6927947+08:00;False|2025-09-18T10:35:09.3296840+08:00;False|2025-09-17T08:59:43.2361715+08:00;True|2025-09-16T13:46:04.3354749+08:00;True|2025-09-16T09:03:10.5224849+08:00;False|2025-09-16T09:02:54.0939495+08:00;True|2025-09-15T19:07:55.0065322+08:00;False|2025-09-15T19:07:43.9078258+08:00;True|2025-09-15T13:43:02.7194840+08:00;True|2025-09-15T12:43:41.8299278+08:00;False|2025-09-15T12:43:16.3202892+08:00;True|2025-09-14T20:52:09.3599497+08:00;False|2025-09-14T20:51:55.5551910+08:00;True|2025-09-14T16:35:56.4267213+08:00;True|2025-09-14T16:10:35.4507582+08:00;True|2025-09-14T16:04:30.0969247+08:00;True|2025-09-14T16:03:46.0958639+08:00;True|2025-09-14T16:01:52.5082969+08:00;True|2025-09-14T15:12:07.0239617+08:00;True|2025-09-14T14:55:31.3810881+08:00;False|2025-09-14T13:41:00.1248761+08:00;False|2025-09-12T09:12:36.1841750+08:00;True|2025-09-11T10:28:59.5711340+08:00;False|2025-09-11T10:28:29.0428624+08:00;True|2025-09-10T10:13:31.1270766+08:00;True|2025-09-10T09:36:50.3578377+08:00;False|2025-09-10T09:36:20.6920631+08:00;True|2025-09-08T09:40:08.0905332+08:00;False|2025-09-08T09:39:51.3125449+08:00;True|2025-09-05T15:38:09.2320346+08:00;True|2025-09-05T15:27:54.0459013+08:00;False|2025-09-05T15:27:44.7828443+08:00;True|2025-09-04T17:06:55.5968659+08:00;True|2025-09-04T17:05:18.9087838+08:00;True|2025-09-04T15:19:29.4095578+08:00;False|2025-09-04T15:19:02.5866931+08:00;True|2025-09-03T15:51:28.9030672+08:00;True|2025-09-03T15:50:23.6292004+08:00;True|2025-09-03T15:49:09.2787247+08:00;True|2025-09-03T15:37:43.1319700+08:00;True|2025-09-03T15:02:42.8547695+08:00;True|2025-09-03T13:59:23.7496636+08:00;False|2025-09-03T13:58:55.4054677+08:00;True|2025-09-02T14:17:50.6091123+08:00;True|2025-09-02T13:40:51.7669061+08:00;False|2025-09-02T13:40:13.3546740+08:00;False|2025-09-02T13:38:48.5403592+08:00;False|2025-09-02T13:37:59.6191295+08:00;False|2025-09-02T13:37:32.6098133+08:00;False|2025-09-02T13:37:12.0832669+08:00;True|2025-08-21T13:25:47.4858992+08:00;False|2025-08-21T13:25:32.4156686+08:00;True|2025-08-19T16:07:39.0889263+08:00;True|2025-08-19T16:07:20.3364203+08:00;False|2025-08-19T16:07:00.6078098+08:00;True|2025-08-15T13:33:04.6083649+08:00;False|2025-08-15T13:32:48.5596650+08:00;False|2025-08-14T11:07:04.9417057+08:00;True|2025-08-13T20:37:56.2729405+08:00;True|2025-08-13T20:27:46.2457492+08:00;False|2025-08-13T20:27:22.2365010+08:00;True|2025-08-13T17:38:47.4698629+08:00;True|2025-08-13T14:13:18.0867415+08:00;True|2025-08-13T14:10:53.5215303+08:00;False|2025-08-13T14:10:38.6533775+08:00;True|2025-08-08T14:45:38.8710223+08:00;True|2025-08-08T14:36:05.4506899+08:00;False|2025-08-08T14:35:49.2395019+08:00;True|2025-08-08T12:51:05.5753201+08:00;False|2025-08-08T12:50:41.8998290+08:00;True|2025-08-07T17:46:25.3848582+08:00;True|2025-08-07T14:41:24.7638189+08:00;False|2025-08-07T14:41:08.4966741+08:00;True|2025-08-07T13:18:45.4109538+08:00;False|2025-08-07T13:18:23.6541139+08:00;True|2025-08-06T14:48:29.1813368+08:00;False|2025-08-06T14:48:01.7497640+08:00;True|2025-07-31T11:31:26.9211602+08:00;True|2025-07-31T11:30:27.0395269+08:00;True|2025-07-31T11:20:53.3394769+08:00;True|2025-07-31T11:20:15.7759103+08:00;True|2025-07-31T11:16:57.3823431+08:00;True|2025-07-31T11:05:05.9382499+08:00;True|2025-07-31T10:53:29.9296027+08:00;True|2025-07-31T10:50:29.6294739+08:00;True|2025-07-31T09:38:12.2534472+08:00;True|2025-07-31T09:36:26.1364414+08:00;True|2025-07-31T09:09:38.4479829+08:00;True|2025-07-31T09:01:56.6376393+08:00;True|2025-07-31T08:57:38.0151708+08:00;False|2025-07-31T08:57:19.7029116+08:00;True|2025-07-30T13:59:10.3846558+08:00;True|2025-07-30T13:57:28.7712713+08:00;True|2025-07-30T13:30:14.3755448+08:00;True|2025-07-30T12:47:57.3189783+08:00;True|2025-07-30T12:44:40.9257897+08:00;True|2025-07-30T12:44:26.3988519+08:00;True|2025-07-30T12:42:14.3621410+08:00;True|2025-07-30T12:37:47.5857800+08:00;True|2025-07-30T11:29:53.6303914+08:00;True|2025-07-30T11:23:36.6544326+08:00;True|2025-07-30T09:52:50.5539574+08:00;True|2025-07-30T09:51:43.0235088+08:00;False|2025-07-30T09:51:20.4585269+08:00;True|2025-07-29T18:14:57.7912495+08:00;True|2025-07-29T18:06:59.7432032+08:00;True|2025-07-29T18:06:21.4067333+08:00;True|2025-07-29T18:04:44.7727076+08:00;True|2025-07-29T18:03:16.6330864+08:00;True|2025-07-29T17:58:22.4884094+08:00;True|2025-07-29T17:51:17.4731594+08:00;True|2025-07-29T17:30:02.5175752+08:00;True|2025-07-29T17:22:51.2206869+08:00;True|2025-07-29T15:58:06.7872139+08:00;True|2025-07-29T15:52:25.6935664+08:00;False|2025-07-29T15:51:57.5197553+08:00;True|2025-07-28T17:33:18.1495336+08:00;True|2025-07-28T15:04:36.1888394+08:00;True|2025-07-28T14:19:20.1483024+08:00;True|2025-07-28T14:13:33.0338382+08:00;True|2025-07-28T14:06:02.4983388+08:00;False|2025-07-28T14:05:44.8336761+08:00;False|2025-07-26T12:52:08.1302577+08:00;True|2025-07-25T18:16:22.4916372+08:00;True|2025-07-25T18:10:03.8748246+08:00;True|2025-07-25T18:09:20.6646310+08:00;True|2025-07-25T18:05:24.3772735+08:00;True|2025-07-25T17:56:03.7506046+08:00;True|2025-07-25T17:51:18.4125686+08:00;True|2025-07-25T14:26:44.2546206+08:00;False|2025-07-25T14:26:12.6493026+08:00;True|2025-07-16T19:29:27.0515947+08:00;True|2025-07-16T19:20:01.1132696+08:00;True|2025-07-16T19:16:14.3793010+08:00;True|2025-07-16T19:13:05.0534366+08:00;False|2025-07-16T19:12:48.7636107+08:00;True|2025-07-16T09:21:13.4303928+08:00;True|2025-07-16T09:17:35.4522435+08:00;False|2025-07-16T09:17:13.5076021+08:00;True|2025-07-15T16:57:08.8718036+08:00;False|2025-07-15T16:56:49.7095589+08:00;True|2025-07-10T17:26:30.2500808+08:00;True|2025-07-10T15:05:35.1960737+08:00;False|2025-07-10T15:05:24.5526075+08:00;True|2025-07-09T18:07:52.8307734+08:00;False|2025-07-09T18:07:32.9729733+08:00;True|2025-07-08T09:05:02.3758956+08:00;False|2025-07-08T09:04:45.0633912+08:00;True|2025-07-07T18:57:42.4794642+08:00;True|2025-07-07T18:45:14.4070657+08:00;False|2025-07-07T18:44:22.9506493+08:00;True|2025-07-01T11:37:30.2505294+08:00;True|2025-07-01T11:34:58.9780159+08:00;True|2025-07-01T11:30:55.9731169+08:00;True|2025-07-01T10:50:40.9750731+08:00;True|2025-07-01T10:49:29.5040084+08:00;True|2025-07-01T10:47:32.5577113+08:00;True|2025-07-01T10:45:01.5920641+08:00;False|2025-07-01T10:44:36.2906054+08:00;True|2025-06-30T20:20:37.5108405+08:00;True|2025-06-30T20:18:18.1141382+08:00;False|2025-06-30T20:17:50.2618215+08:00;True|2025-06-30T17:08:40.2046600+08:00;True|2025-06-30T14:13:27.9276170+08:00;False|2025-06-30T14:13:08.2955829+08:00;True|2025-06-26T14:59:37.9432510+08:00;False|2025-06-26T14:59:27.7120940+08:00;True|2025-06-25T10:08:11.5435336+08:00;True|2025-06-25T09:48:15.6545862+08:00;True|2025-06-25T09:17:39.4282829+08:00;False|2025-06-25T09:17:06.1173641+08:00;True|2025-06-24T14:24:24.8608110+08:00;True|2025-06-24T13:29:41.8846061+08:00;True|2025-06-24T11:40:24.7114753+08:00;True|2025-06-24T11:38:39.9925984+08:00;True|2025-06-24T11:31:43.1414921+08:00;True|2025-06-24T11:29:18.2941264+08:00;True|2025-06-24T11:14:30.3743100+08:00;True|2025-06-24T11:13:48.7680482+08:00;True|2025-06-24T11:09:58.5968569+08:00;True|2025-06-24T11:08:08.7682780+08:00;True|2025-06-24T10:37:50.2746842+08:00;True|2025-06-24T10:04:21.1792934+08:00;True|2025-06-24T09:38:18.3176776+08:00;True|2025-06-24T09:34:50.3708868+08:00;False|2025-06-24T09:34:26.4728698+08:00;True|2025-06-23T17:05:32.5796810+08:00;True|2025-06-23T17:04:05.0688937+08:00;True|2025-06-23T13:59:19.2688884+08:00;True|2025-06-23T11:29:10.3814551+08:00;True|2025-06-23T11:19:54.5044517+08:00;True|2025-06-23T11:05:38.5603293+08:00;True|2025-06-23T10:57:03.6611727+08:00;True|2025-06-23T10:49:36.9130331+08:00;False|2025-06-23T10:49:18.5916897+08:00;True|2025-06-20T13:29:58.8176897+08:00;True|2025-06-20T13:15:43.7374949+08:00;False|2025-06-20T13:15:20.7432688+08:00;True|2025-06-19T21:46:29.0476990+08:00;True|2025-06-19T21:44:07.0255680+08:00;True|2025-06-19T21:40:54.8917004+08:00;True|2025-06-19T21:30:44.8729100+08:00;True|2025-06-19T21:17:13.9288647+08:00;True|2025-06-19T21:11:59.7332020+08:00;True|2025-06-19T21:10:46.7558553+08:00;True|2025-06-19T21:06:59.9821855+08:00;True|2025-06-19T20:57:42.2255608+08:00;True|2025-06-19T20:54:22.1485351+08:00;True|2025-06-19T20:53:39.4877170+08:00;True|2025-06-19T20:51:40.1134467+08:00;True|2025-06-19T20:50:06.2220331+08:00;True|2025-06-19T20:43:40.4300258+08:00;True|2025-06-19T20:43:28.4637040+08:00;True|2025-06-19T20:40:58.3939790+08:00;True|2025-06-19T20:38:18.1067206+08:00;True|2025-06-19T20:34:36.8473391+08:00;True|2025-06-19T20:31:08.0652635+08:00;True|2025-06-19T20:29:17.2962865+08:00;True|2025-06-19T20:25:12.9054302+08:00;True|2025-06-19T20:19:04.3290755+08:00;True|2025-06-19T20:10:38.1069948+08:00;True|2025-06-19T20:07:41.9318197+08:00;True|2025-06-19T20:05:31.8825704+08:00;True|2025-06-19T19:59:45.4008154+08:00;True|2025-06-19T19:57:44.1169317+08:00;True|2025-06-19T19:49:05.9273689+08:00;True|2025-06-19T19:21:38.1003970+08:00;True|2025-06-19T19:21:29.4057702+08:00;True|2025-06-19T19:20:49.9520871+08:00;False|2025-06-19T19:20:33.1351490+08:00;True|2025-06-19T17:47:11.8899733+08:00;True|2025-06-19T17:45:51.9461440+08:00;True|2025-06-19T17:42:40.4214364+08:00;True|2025-06-19T17:32:29.9585738+08:00;True|2025-06-19T17:31:57.7429273+08:00;True|2025-06-19T17:31:22.8039838+08:00;True|2025-06-19T16:44:04.9869169+08:00;False|2025-06-19T16:43:53.4308248+08:00;True|2025-06-17T12:44:47.9445980+08:00;True|2025-06-17T12:43:01.6173041+08:00;True|2025-06-17T12:39:35.7469432+08:00;True|2025-06-17T12:17:21.9820010+08:00;True|2025-06-17T11:56:26.7990171+08:00;True|2025-06-17T11:51:59.9444746+08:00;True|2025-06-17T11:50:10.5654966+08:00;True|2025-06-17T11:47:05.2216982+08:00;True|2025-06-17T11:38:52.7237953+08:00;False|2025-06-17T11:38:34.7222132+08:00;True|2025-06-16T19:04:02.3364713+08:00;False|2025-06-16T19:03:45.5930596+08:00;True|2025-06-10T16:19:31.0614174+08:00;True|2025-06-10T16:15:20.6430188+08:00;True|2025-06-10T13:15:38.2392519+08:00;True|2025-06-10T13:14:06.0141666+08:00;True|2025-06-10T13:10:57.3109515+08:00;False|2025-06-10T13:10:44.6334322+08:00;True|2025-06-09T14:19:19.3678350+08:00;True|2025-06-09T13:59:16.4472313+08:00;True|2025-06-09T13:44:59.6573868+08:00;False|2025-06-09T13:44:35.1189385+08:00;True|2025-06-06T14:38:53.2242596+08:00;False|2025-06-06T14:38:29.8735366+08:00;True|2025-06-04T20:53:59.2893402+08:00;False|2025-06-04T20:53:43.4073803+08:00;True|2025-06-03T14:29:52.2448301+08:00;True|2025-06-03T13:56:38.1301683+08:00;True|2025-06-03T13:38:56.7749508+08:00;True|2025-06-03T13:28:45.2901426+08:00;True|2025-06-03T13:27:57.6382388+08:00;True|2025-06-03T13:25:05.8249778+08:00;True|2025-06-03T13:20:50.3714171+08:00;True|2025-06-03T13:19:44.4918539+08:00;True|2025-06-03T13:16:57.8393576+08:00;True|2025-06-03T13:15:35.6020739+08:00;True|2025-06-03T09:29:22.1826197+08:00;True|2025-06-03T08:54:43.5376489+08:00;True|2025-06-03T08:48:51.2196179+08:00;False|2025-06-03T08:48:23.6531326+08:00;True|2025-05-30T19:14:33.1321659+08:00;True|2025-05-30T19:09:28.6321844+08:00;False|2025-05-30T19:09:10.9611020+08:00;True|2025-05-30T11:10:09.3804694+08:00;False|2025-05-30T11:09:38.9759833+08:00;True|2025-05-30T09:25:55.8349264+08:00;False|2025-05-30T09:25:33.7512390+08:00;True|2025-05-29T13:19:09.3041429+08:00;False|2025-05-29T13:18:52.3875953+08:00;True|2025-05-28T18:34:06.8273247+08:00;True|2025-05-28T18:31:05.4364474+08:00;True|2025-05-28T18:27:41.8513807+08:00;True|2025-05-28T18:20:47.6240772+08:00;False|2025-05-28T18:20:38.0301633+08:00;True|2025-05-28T15:45:55.3418948+08:00;True|2025-05-28T15:44:59.7156409+08:00;True|2025-05-28T15:43:03.0458642+08:00;True|2025-05-28T15:40:55.1488977+08:00;True|2025-05-28T15:25:49.1288443+08:00;True|2025-05-28T14:35:05.2561044+08:00;True|2025-05-28T09:39:05.7154902+08:00;False|2025-05-28T09:38:43.0839585+08:00;True|2025-05-26T19:34:53.6400925+08:00;True|2025-05-26T19:19:09.7485729+08:00;True|2025-05-26T19:16:13.4436032+08:00;True|2025-05-26T19:15:41.5587345+08:00;True|2025-05-26T19:13:28.2496521+08:00;True|2025-05-26T19:11:13.9374078+08:00;True|2025-05-26T19:08:26.7288220+08:00;True|2025-05-26T19:07:41.6174469+08:00;True|2025-05-26T19:07:17.8455284+08:00;True|2025-05-26T19:03:18.8383293+08:00;True|2025-05-26T19:02:38.1409352+08:00;True|2025-05-26T18:04:23.0851072+08:00;True|2025-05-26T18:00:37.9490175+08:00;True|2025-05-26T17:36:14.9186618+08:00;True|2025-05-26T17:04:56.2652242+08:00;True|2025-05-26T17:03:32.3788117+08:00;True|2025-05-26T17:01:11.8316740+08:00;True|2025-05-26T16:54:02.0120204+08:00;True|2025-05-26T16:50:36.6739590+08:00;True|2025-05-26T16:20:54.0793563+08:00;True|2025-05-26T16:19:13.4466564+08:00;True|2025-05-26T16:18:37.0522011+08:00;True|2025-05-26T16:10:07.6439971+08:00;True|2025-05-26T16:07:37.9881606+08:00;True|2025-05-26T15:58:45.5790885+08:00;True|2025-05-26T15:57:39.8957333+08:00;True|2025-05-26T15:56:04.5332484+08:00;True|2025-05-26T15:54:08.6770273+08:00;True|2025-05-26T15:51:31.9863077+08:00;True|2025-05-26T14:17:37.4566639+08:00;True|2025-05-26T14:14:45.6478856+08:00;True|2025-05-26T14:13:32.3061443+08:00;True|2025-05-26T14:09:53.7668953+08:00;True|2025-05-26T14:08:53.7195888+08:00;True|2025-05-26T14:06:33.9160028+08:00;True|2025-05-26T09:43:55.0924210+08:00;True|2025-05-26T09:17:54.8815561+08:00;False|2025-05-26T09:17:46.0326457+08:00;True|2025-05-23T10:23:17.1057955+08:00;True|2025-05-23T10:22:31.7938776+08:00;False|2025-05-23T10:22:01.3464796+08:00;False|2025-05-23T10:21:56.8447978+08:00;True|2025-05-23T10:04:53.2423852+08:00;False|2025-05-23T10:04:21.9568682+08:00;True|2025-05-22T13:39:26.7824978+08:00;True|2025-05-22T12:19:49.9134386+08:00;False|2025-05-22T12:18:56.4955831+08:00;True|2025-05-22T09:31:52.8998426+08:00;False|2025-05-22T09:31:31.5103211+08:00;True|2025-05-21T21:36:19.8162653+08:00;True|2025-05-21T21:33:04.3951416+08:00;True|2025-05-21T21:31:06.3835951+08:00;True|2025-05-21T21:27:11.7590428+08:00;False|2025-05-21T21:26:18.2096217+08:00;True|2025-05-21T10:13:15.7576895+08:00;True|2025-05-21T10:08:35.9305095+08:00;False|2025-05-21T10:08:06.4393322+08:00;True|2025-05-20T20:52:06.7190772+08:00;False|2025-05-20T20:51:27.6441551+08:00;True|2025-05-20T10:50:39.3347667+08:00;True|2025-05-20T10:47:24.1628977+08:00;True|2025-05-20T10:42:22.4420459+08:00;True|2025-05-20T10:32:16.8802462+08:00;True|2025-05-20T10:20:12.5700338+08:00;False|2025-05-20T10:19:04.0954824+08:00;True|2025-05-19T10:08:49.0227698+08:00;True|2025-05-19T10:07:02.6110035+08:00;True|2025-05-19T10:05:49.7223902+08:00;True|2025-05-19T09:59:20.9398247+08:00;True|2025-05-19T09:58:31.8629178+08:00;False|2025-05-19T09:57:34.9251908+08:00;True|2025-05-17T12:01:30.1645467+08:00;True|2025-05-17T12:00:32.2339947+08:00;True|2025-05-17T11:55:19.4680460+08:00;True|2025-05-17T11:30:39.9716640+08:00;True|2025-05-17T11:24:41.2103791+08:00;False|2025-05-17T11:24:01.4177591+08:00;True|2025-05-16T16:04:53.4865079+08:00;True|2025-05-16T16:01:42.2978627+08:00;True|2025-05-16T15:59:07.5525777+08:00;True|2025-05-16T12:53:01.9848534+08:00;False|2025-05-16T12:52:37.5899807+08:00;True|2025-05-15T20:18:19.1959577+08:00;True|2025-05-15T20:16:31.3601343+08:00;False|2025-05-15T20:16:14.8877379+08:00;True|2025-05-15T17:13:41.3961273+08:00;True|2025-05-15T16:51:14.1735434+08:00;True|2025-05-15T16:40:38.1341678+08:00;True|2025-05-15T16:23:55.7504003+08:00;True|2025-05-15T15:39:08.0682854+08:00;True|2025-05-15T14:13:21.2837860+08:00;True|2025-05-15T13:36:02.4058882+08:00;True|2025-05-15T13:28:29.8243952+08:00;True|2025-05-15T10:26:14.6137519+08:00;True|2025-05-15T10:21:16.4378162+08:00;False|2025-05-15T10:20:39.3117941+08:00;False|2025-05-14T12:58:11.4083857+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/layui/layui.js">
@@ -29,11 +29,11 @@
     </File>
     <File Include="bin/WebTM.dll">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>09/15/2025 10:42:57</publishTime>
+      <publishTime>09/28/2025 09:23:43</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>09/15/2025 10:42:57</publishTime>
+      <publishTime>09/28/2025 09:23:43</publishTime>
     </File>
     <File Include="Download/WMS杞欢瀹夎鍖�.apk">
       <publishTime>07/26/2025 12:50:47</publishTime>
@@ -1244,10 +1244,10 @@
     <File Include="layuiadmin/Scripts/webConfig.js">
       <publishTime>04/27/2021 13:44:39</publishTime>
       <publishTime>04/30/2021 08:50:34</publishTime>
-      <publishTime>09/11/2025 10:26:53</publishTime>
+      <publishTime>09/16/2025 09:02:45</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig2.js">
-      <publishTime>07/30/2025 13:08:56</publishTime>
+      <publishTime>09/26/2025 09:45:44</publishTime>
     </File>
     <File Include="layuiadmin/serial-reader.js">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -2801,7 +2801,7 @@
       <publishTime>05/23/2025 09:19:17</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/浜ч噺姹囨姤/Sc_ICMOBillWorkQtyStatus_PDA.html">
-      <publishTime>09/14/2025 20:51:44</publishTime>
+      <publishTime>09/15/2025 19:52:47</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鍏朵粬鍏ュ簱/Kf_OtherInBackBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -3203,7 +3203,7 @@
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">
       <publishTime>04/14/2021 10:16:51</publishTime>
       <publishTime>04/14/2021 10:16:51</publishTime>
-      <publishTime>08/19/2025 16:01:16</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_CheckList_New.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3225,10 +3225,10 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockStepOutBill_Fast.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3242,7 +3242,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/濮斿鐢ㄦ枡鍗�/WW_PPBomBillList.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
@@ -3311,13 +3311,13 @@
       <publishTime>08/19/2025 16:01:16</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/缁勬墭鍗�/Sc_PackUnionBillMain_Setto.html">
-      <publishTime>08/19/2025 16:01:16</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/瑁呯鍗�/Sc_PackUnionBillMain_Packing.html">
-      <publishTime>08/19/2025 16:01:16</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -3900,7 +3900,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>09/11/2025 10:19:52</publishTime>
+      <publishTime>09/23/2025 10:40:06</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4984,7 +4984,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Kf_SellOutEntryReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Kf_SellOutEntryReport_YP.html">
       <publishTime>08/19/2025 16:01:16</publishTime>
@@ -5017,10 +5017,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeEntryReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeMaterEntryReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5394,7 +5394,7 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
       <publishTime>04/14/2021 09:01:36</publishTime>
       <publishTime>04/14/2021 09:01:36</publishTime>
-      <publishTime>08/07/2025 13:28:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList_JiaNan.html">
       <publishTime>08/19/2025 16:01:16</publishTime>
@@ -5443,10 +5443,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
       <publishTime>04/16/2021 08:45:47</publishTime>
@@ -5749,6 +5749,9 @@
     <File Include="views/鐢熶骇绠$悊/瀹濆伐鎺掍骇/JIT_DayPlanPlatForm_DayImport.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
+    <File Include="views/鐢熶骇绠$悊/瀹濆伐鎺掍骇/JIT_DayPlanPlatForm_New.html">
+      <publishTime>05/23/2025 09:19:19</publishTime>
+    </File>
     <File Include="views/鐢熶骇绠$悊/瀹濆伐鎺掍骇/JIT_LockRequestBill.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
@@ -5801,7 +5804,7 @@
       <publishTime>07/16/2025 19:34:56</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/21/2025 15:40:37</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMainList.html">
       <publishTime>07/16/2025 19:34:56</publishTime>
@@ -5822,10 +5825,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_Add_MESExecptFeedBackBillList.html">
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>09/19/2025 15:24:16</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillList.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>09/28/2025 16:10:02</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillResumeList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5846,7 +5849,7 @@
       <publishTime>06/24/2025 13:26:24</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html">
-      <publishTime>06/09/2025 12:01:42</publishTime>
+      <publishTime>09/21/2025 14:55:53</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html">
       <publishTime>09/03/2025 13:36:35</publishTime>
@@ -5861,7 +5864,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">
-      <publishTime>09/15/2025 13:42:52</publishTime>
+      <publishTime>09/16/2025 13:45:49</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html">
       <publishTime>06/10/2025 15:02:35</publishTime>
@@ -6047,7 +6050,7 @@
       <publishTime>07/16/2025 19:34:56</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/娣诲悍涓夊懆鎺掍骇/JIT_DayPlanPlatForm_TK2.html">
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/娣诲悍涓夊懆鎺掍骇/JIT_LiftMaterPlaBillnList_TK.html">
       <publishTime>07/16/2025 19:34:56</publishTime>
@@ -6121,7 +6124,7 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>09/13/2025 11:40:23</publishTime>
+      <publishTime>09/19/2025 17:32:17</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList_LookDown.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6287,7 +6290,7 @@
       <publishTime>06/09/2025 12:01:42</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html">
-      <publishTime>06/10/2025 12:10:46</publishTime>
+      <publishTime>09/19/2025 15:50:45</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html">
       <publishTime>06/09/2025 12:01:42</publishTime>
@@ -6317,13 +6320,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇閫�搴撳崟/Sc_ProductionReturnList.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/缁勬墭鍗曠紪杈�/Sc_GroupOrderBillEdit_Fast.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/20/2025 11:45:06</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6648,7 +6651,7 @@
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>09/13/2025 11:40:23</publishTime>
+      <publishTime>09/19/2025 17:32:17</publishTime>
     </File>
     <File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -6746,7 +6749,7 @@
       <publishTime>06/25/2025 10:08:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6935,10 +6938,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧鎶ヨ〃/Sb_EquipMentCollectionTechParam.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/17/2025 08:59:10</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧鎶ヨ〃/Sb_EquipMentCollectionTechParam_Temp.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/17/2025 08:58:38</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧鎶ヨ〃/Sb_EquipmentLoadReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7085,13 +7088,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html">
-      <publishTime>09/13/2025 15:44:20</publishTime>
+      <publishTime>09/17/2025 09:59:02</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckOtherBillList.html">
-      <publishTime>09/13/2025 13:48:59</publishTime>
+      <publishTime>09/17/2025 14:39:06</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ヤ綔鑱旂郴鍗�/OA_Add_Edit_WorkLinkBill.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7112,13 +7115,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
-      <publishTime>09/13/2025 15:50:17</publishTime>
+      <publishTime>09/21/2025 14:46:15</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList2.html">
-      <publishTime>09/13/2025 13:46:28</publishTime>
+      <publishTime>09/17/2025 14:37:01</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/搴撳瓨妫�楠屽崟/QC_Add_Edit_StockCheckBill.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -7316,7 +7319,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_QualityTraceabilityReport.html">
-      <publishTime>09/13/2025 11:41:19</publishTime>
+      <publishTime>09/15/2025 18:09:05</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_RegistrationForTestingReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7358,13 +7361,13 @@
       <publishTime>07/22/2021 08:55:24</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>09/13/2025 15:48:45</publishTime>
+      <publishTime>09/21/2025 14:22:08</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList2.html">
-      <publishTime>09/13/2025 13:43:36</publishTime>
+      <publishTime>09/17/2025 14:34:17</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7399,16 +7402,16 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/MES_BarcodeWhiteLabelReport.html">
-      <publishTime>08/15/2025 13:40:45</publishTime>
+      <publishTime>09/23/2025 10:16:27</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackaging.html">
-      <publishTime>09/05/2025 15:27:36</publishTime>
+      <publishTime>09/23/2025 10:47:46</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackagingList.html">
-      <publishTime>09/08/2025 11:26:31</publishTime>
+      <publishTime>09/23/2025 10:36:50</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/MES_ProductionLinePackaging_MXG.html">
-      <publishTime>08/28/2025 13:27:13</publishTime>
+      <publishTime>10/07/2025 23:04:24</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/MES_WhiteLabelGeneration.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7417,7 +7420,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/RetrospectionCustomerReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>09/20/2025 11:59:13</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/Sc_GroupOrderBill.html">
       <publishTime>08/14/2025 17:33:36</publishTime>
@@ -7426,7 +7429,7 @@
       <publishTime>08/13/2025 20:37:29</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/Sc_GroupOrderBillList.html">
-      <publishTime>08/15/2025 13:41:08</publishTime>
+      <publishTime>09/20/2025 12:03:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/浜х嚎/Sc_PackUnionBillBarCode_tempList.html">
       <publishTime>09/04/2025 15:13:58</publishTime>
@@ -7733,7 +7736,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_BatchSplit.html">
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>09/19/2025 17:41:01</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_BatchSplit_1.html">
+      <publishTime>09/19/2025 17:25:15</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_CF.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7904,11 +7910,17 @@
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_StereoscopicFlowerOutReport.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
+    <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Kf_WorkShopICStockBillList.html">
+      <publishTime>09/15/2025 18:07:21</publishTime>
+    </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport_ICMO.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport_TK.html">
+      <publishTime>09/18/2025 14:28:12</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8177,7 +8189,7 @@
       <publishTime>09/11/2025 10:19:52</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillQuery.html">
-      <publishTime>09/11/2025 10:19:52</publishTime>
+      <publishTime>10/09/2025 15:43:01</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBill_LookDown.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8201,80 +8213,80 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/淇$敤棰濆害鐢宠鍗�/Xs_CusRatingChangeBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/淇$敤棰濆害鐢宠鍗�/Xs_CusRatingChangeBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMain.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍏朵粬搴旀敹鍗�/YS_ReceiveOtherBillMainList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍑洪棬纭鍗�/Xs_OutDoorCheckBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍑洪棬纭鍗昣鏂�/Xs_OutDoorBill.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍑洪棬纭鍗昣鏂�/Xs_OutDoorBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Add_Edit_Xs_SeOutStockBillList.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
       <publishTime>04/16/2021 10:32:11</publishTime>
       <publishTime>04/16/2021 10:32:11</publishTime>
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillQuery.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/瀹㈡埛鎷滆璁板綍鍗�/Crm_ComplainVisitBillMain.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/瀹㈡埛鎷滆璁板綍鍗�/Crm_ComplainVisitBillMainList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBill.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/搴旀敹鍗�/Xs_ReceivableBillQuery.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/搴旀敹閫�娆惧崟/YS_ReceiveBackBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/搴旀敹閫�娆惧崟/YS_ReceiveBackBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鏀舵鍗�/YS_ReceiveBillQuery.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鐗规壒鐢宠鍗�/Xs_ExceptiveCheckRequestBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
       <publishTime>04/16/2021 10:35:46</publishTime>
       <publishTime>04/16/2021 10:35:46</publishTime>
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞悎鍚�/Add_Edit_Xs_ContractBillList.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8283,10 +8295,10 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞姤浠峰崟/Xs_SeQuotationBillMain.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞姤浠峰崟/Xs_SeQuotationBillMainList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞姤琛�/Xe_SeOutReport.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8316,7 +8328,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Add_Edit_Xs_SeOrderBillList.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillDyColList.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8324,13 +8336,13 @@
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
       <publishTime>04/16/2021 10:32:11</publishTime>
       <publishTime>04/16/2021 10:32:11</publishTime>
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList_YP.html">
       <publishTime>08/19/2025 16:01:16</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillQuery.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBill_LookDown.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8342,28 +8354,28 @@
       <publishTime>04/15/2021 15:35:15</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗曞彉鏇村崟/Xs_SeOrderChangeBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞皟浠峰崟/Xs_SellOutChangeBill.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞皟浠峰崟/Xs_SellOutChangeBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Add_Edit_Kf_ICStockBillMainList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBackBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBackBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞��璐у崟/Kf_ICStockBillMainList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBill.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8378,7 +8390,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/鍛ㄨ鍒�/PM_WorkTaskWeekBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/椤圭洰绠$悊/鍛ㄨ鍒�/PM_WorkTaskWeekBillList.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8553,7 +8565,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBackBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8639,12 +8651,12 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
       <publishTime>04/14/2021 13:43:50</publishTime>
       <publishTime>04/14/2021 13:43:50</publishTime>
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList_BarCodeNote.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8656,7 +8668,7 @@
       <publishTime>09/05/2025 16:05:26</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillQuery.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_CheckList_New.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8681,7 +8693,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8694,18 +8706,18 @@
       <publishTime>08/27/2021 09:06:17</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillEdit_MaoJian.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillEdit_YangMao.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillLEdit.html">
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
       <publishTime>04/14/2021 13:24:27</publishTime>
       <publishTime>04/14/2021 13:24:27</publishTime>
-      <publishTime>09/05/2025 16:05:26</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_CheckList_New.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8730,16 +8742,16 @@
       <publishTime>10/10/2023 08:56:26</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutRequestBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutRequestBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8793,7 +8805,7 @@
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
       <publishTime>04/16/2021 10:03:54</publishTime>
       <publishTime>04/16/2021 10:03:54</publishTime>
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8825,7 +8837,7 @@
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>09/11/2025 10:19:52</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill_Add_Up.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8833,7 +8845,7 @@
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
       <publishTime>04/15/2021 16:31:28</publishTime>
       <publishTime>04/15/2021 16:31:28</publishTime>
-      <publishTime>09/11/2025 10:19:52</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html">
       <publishTime>09/11/2025 10:19:52</publishTime>
@@ -8869,7 +8881,7 @@
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">
       <publishTime>04/16/2021 10:23:24</publishTime>
       <publishTime>04/16/2021 10:23:24</publishTime>
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>09/15/2025 18:07:21</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8892,7 +8904,7 @@
     </File>
     <File Include="Web.config">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>09/15/2025 12:43:28</publishTime>
+      <publishTime>09/28/2025 09:23:44</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 28c7055..3c8a829 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -423,6 +423,7 @@
     <Content Include="views\浠撳瓨绠$悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInventory_Cus.html" />
+    <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_ICInventory_Cus_Emp.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\Kf_StockInOutEntryByPageReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_StockInOutEntryReport.html" />
     <Content Include="views\浠撳瓨绠$悊\鏉$爜鎶ヨ〃\KF_StockInOutRecordReport.html" />
@@ -519,6 +520,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_StockPlaceList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_BarCodeDetailQuery.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MoveStockBillList.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherInBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPayMentBill.aspx" />
@@ -603,6 +605,7 @@
     <Content Include="views\宸ヨ祫绠$悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
     <Content Include="views\宸ヨ祫绠$悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_CusShouGongChaoBaoSumReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_CusShouGongChaoBaoReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Kf_SellOutEntryReport_YP.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\Xs_OutDoorBillReport.html" />
@@ -668,6 +671,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\鐢熶骇绠$悊\瀹濆伐鎺掍骇\JIT_DayPlanPlatForm_New.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫鍋滃伐鎭㈠鍗昞Sc_MESStopRestoreWorkBill.html" />
     <Content Include="views\鐢熶骇绠$悊\鍑礉鏃ヨ鍒掑鍏JIT_DayPlanPlatForm_KB.html" />
     <Content Include="views\鐢熶骇绠$悊\鍙戣揣璁″垝骞冲彴锛堜笁鍗囷級\Xs_SendGoodsPlanForm.html" />
@@ -926,6 +930,7 @@
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
     <Content Include="views\杞﹂棿绠$悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
+    <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_TK.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_AllowedPrintProcExchangeBillList.html" />
@@ -957,6 +962,7 @@
     <Content Include="views\閲囪喘绠$悊\浠樻鍗昞YF_PayMentBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\搴斾粯鍗昞Cg_PayableBillCheckQuery.html" />
+    <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Add_Edit_Cg_POInStockBillList_TestByLLJ.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillQuery.html" />
     <Content Include="views\閲囪喘绠$悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillList_JiaNan.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘鎶ヨ〃\Gy_SupplierPayPlanReport.html" />
@@ -2690,6 +2696,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MoveStockBillList.aspx.designer.cs">
       <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherInBillList.aspx.cs">
+      <DependentUpon>xmlLBM_Kf_OtherInBillList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_OtherInBillList.aspx.designer.cs">
+      <DependentUpon>xmlLBM_Kf_OtherInBillList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
       <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2f7c57c..89909e4 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,8 +2,8 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠g爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
+    <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/WebTM/layuiadmin/HideButton_New.js b/WebTM/layuiadmin/HideButton_New.js
index 917d923..781e409 100644
--- a/WebTM/layuiadmin/HideButton_New.js
+++ b/WebTM/layuiadmin/HideButton_New.js
@@ -22,8 +22,12 @@
 
     //鑾峰彇鎸夐挳闅愯棌璁剧疆绐楀彛鏂囦欢璺緞
     var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+
+    var viewsLocation = urlStr.indexOf('views')
+    var viewsLocation = urlStr.indexOf('views')
+    urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
     var urlLen = urlStr.split('/');
-    for (var i = 0; i < urlLen.length - 4; i++) {
+    for (var i = 0; i < urlLen.length - 1; i++) {
         contentUrl += "../";
     }
     contentUrl += '绯荤粺绠$悊/鎸夐挳璁剧疆/Xt_ModuleButtonSet.html?HModName=' + HModName + '&HBillType=' + HBillType + "&btnIdList=" + btnIdList + "&btnNameList=" + btnNameList + "&btnOrderList=" + btnOrderList + "&HUserName=" + HUserName;
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 97e0bd0..a095212 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,12 @@
     /*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:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
-    /*var WEBURL = "http://localhost:81/API/";   */         // 闄堥晲鍝叉湰鍦伴厤缃�
+  /*  var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
     // var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
diff --git a/WebTM/layuiadmin/Scripts/webConfig2.js b/WebTM/layuiadmin/Scripts/webConfig2.js
index e0f3db3..076b516 100644
--- a/WebTM/layuiadmin/Scripts/webConfig2.js
+++ b/WebTM/layuiadmin/Scripts/webConfig2.js
@@ -1,19 +1,19 @@
 锘縡unction GetWEBURL() {
     var WEBURL = "http://localhost:8082/API_BaoZhuang/";   //鏈湴鐜
-    //var WEBURL = 'http://30.10.7.6:8080/WebAPI/';   //鏂帿灏斿鎴风幆澧� 澶栫綉
-    //var WEBURL = 'http://10.11.18.195:8080/WebAPI/';   //鏂帿灏斿鎴风幆澧�
-    //WEBURL = "http://192.168.2.168:8082/WebAPI/";   //鏈湴鐜
+    //var WEBURL = "http://183.129.231.78:8081/smrWebapics/";   //鏂帿灏斿鎴风幆澧� 澶栫綉
+    //var WEBURL = "http://30.10.7.6:8080//WEBAPICS/";   //鏂帿灏斿鎴风幆澧� 鍐呯綉
     return WEBURL
 }
 function GetWEBURL1() {
     var WEBURL = "http://localhost:8082/API_BaoZhuang/";   //鏈湴鐜
-    //var WEBURL = 'http://30.10.7.6:8080/WebAPI/';   //鏂帿灏斿鎴风幆澧� 澶栫綉
-    //var WEBURL = 'http://10.11.18.195:8080/WebAPI/';   //鏂帿灏斿鎴风幆澧�
-    //WEBURL = "http://192.168.2.168:8082/WebAPI/";   //鏈湴鐜
+    //var WEBURL = "http://183.129.231.78:8081/smrWebapics/";   //鏂帿灏斿鎴风幆澧� 澶栫綉
+    //var WEBURL = "http://30.10.7.6:8080//WEBAPICS/";   //鏂帿灏斿鎴风幆澧� 鍐呯綉
     return WEBURL
 }
 //椤甸潰缈昏瘧璋冪敤鎺ュ彛
 function GetWEBURlLanguage() {
     var WEBURL = "http://localhost:8082/API/";
-    return WEBURL;
+    //var WEBURL = "http://30.10.7.6:8080/LAYAPICS/"; //鏂帿灏斿鎴风幆澧� 鍐呯綉
+    //var WEBURL = "http://183.129.231.78:8081/CeShiAPI/"; //鏂帿灏斿鎴风幆澧� 澶栫綉
+    return WEBURL
 }
\ No newline at end of file
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 2ca97ef..006e9c6 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -11,8 +11,10 @@
 
     var contentUrl = "";
     var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+    var viewsLocation = urlStr.indexOf('views')
+    urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
     var urlLen = urlStr.split('/');
-    for (var i = 0; i < urlLen.length - 4; i++) {
+    for (var i = 0; i < urlLen.length - 1; i++) {
         contentUrl += "../";
     }
     contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
@@ -49,12 +51,13 @@
 
     var contentUrl = "";
     var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+    var viewsLocation = urlStr.indexOf('views')
+    urlStr = urlStr.substring(viewsLocation + 6, urlStr.length)
     var urlLen = urlStr.split('/');
-    for (var i = 0; i < urlLen.length - 4; i++) {
+    for (var i = 0; i < urlLen.length - 1; i++) {
         contentUrl += "../";
     }
     contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-
     layer.open({
         type: 2
         , skin: "layui-layer-rim" //鍔犱笂杈规
@@ -128,11 +131,11 @@
                                 if (dataCols[3] > 0) {
                                     option.cols[0][i + 1]["width"] = dataCols[3];
                                 }
-                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                //璁剧疆鍐呭瀛椾綋澶у皬 鐩存帴瑕嗙洊鐨勮瘽浼氬鑷村師鏈夌殑鏍峰紡娑堝け锛屾晠浣跨敤鍦╯tyle涓缃甶mportant寮哄埗鍚敤鐨勬柟寮�
                                 if (data1.data[0].HFontSize != 0) {
-                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                    option.cols[0][i + 1]["style"]+="font-size:" + data1.data[0].HFontSize + " !important px;";
                                 } else {
-                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                    option.cols[0][i + 1]["style"]+= "font-size:100% !important;";
                                 }
                                 //鏄剧ず鍒�
                                 if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
diff --git a/WebTM/layuiadmin/dayjs.min.js b/WebTM/layuiadmin/dayjs.min.js
new file mode 100644
index 0000000..61916d8
--- /dev/null
+++ b/WebTM/layuiadmin/dayjs.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).dayjs=e()}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",c="month",f="quarter",h="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,c),s=n-i<0,u=e.clone().add(r+(s?-1:1),c);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:c,y:h,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:f}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p="$isDayjsObject",S=function(t){return t instanceof _||!(!t||!t[p])},w=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},O=function(t,e){if(S(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},b=v;b.l=w,b.i=S,b.w=function(t,e){return O(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=w(t.locale,null,!0),this.parse(t),this.$x=this.$x||t.x||{},this[p]=!0}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(b.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return b},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=O(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return O(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<O(t)},m.$g=function(t,e,n){return b.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!b.u(e)||e,f=b.p(t),l=function(t,e){var i=b.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return b.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(f){case h:return r?l(1,0):l(31,11);case c:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=b.p(t),f="set"+(this.$u?"UTC":""),l=(n={},n[a]=f+"Date",n[d]=f+"Date",n[c]=f+"Month",n[h]=f+"FullYear",n[u]=f+"Hours",n[s]=f+"Minutes",n[i]=f+"Seconds",n[r]=f+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===c||o===h){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[b.p(t)]()},m.add=function(r,f){var d,l=this;r=Number(r);var $=b.p(f),y=function(t){var e=O(l);return b.w(e.date(e.date()+Math.round(t*r)),l)};if($===c)return this.set(c,this.$M+r);if($===h)return this.set(h,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return b.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=b.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,c=n.months,f=n.meridiem,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},d=function(t){return b.s(s%12||12,t,"0")},$=f||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r};return r.replace(y,(function(t,r){return r||function(t){switch(t){case"YY":return String(e.$y).slice(-2);case"YYYY":return b.s(e.$y,4,"0");case"M":return a+1;case"MM":return b.s(a+1,2,"0");case"MMM":return h(n.monthsShort,a,c,3);case"MMMM":return h(c,a);case"D":return e.$D;case"DD":return b.s(e.$D,2,"0");case"d":return String(e.$W);case"dd":return h(n.weekdaysMin,e.$W,o,2);case"ddd":return h(n.weekdaysShort,e.$W,o,3);case"dddd":return o[e.$W];case"H":return String(s);case"HH":return b.s(s,2,"0");case"h":return d(1);case"hh":return d(2);case"a":return $(s,u,!0);case"A":return $(s,u,!1);case"m":return String(u);case"mm":return b.s(u,2,"0");case"s":return String(e.$s);case"ss":return b.s(e.$s,2,"0");case"SSS":return b.s(e.$ms,3,"0");case"Z":return i}return null}(t)||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=this,M=b.p(d),m=O(r),v=(m.utcOffset()-this.utcOffset())*e,g=this-m,D=function(){return b.m(y,m)};switch(M){case h:$=D()/12;break;case c:$=D();break;case f:$=D()/3;break;case o:$=(g-v)/6048e5;break;case a:$=(g-v)/864e5;break;case u:$=g/n;break;case s:$=g/e;break;case i:$=g/t;break;default:$=g}return l?$:b.a($)},m.daysInMonth=function(){return this.endOf(c).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=w(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return b.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),k=_.prototype;return O.prototype=k,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",c],["$y",h],["$D",d]].forEach((function(t){k[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),O.extend=function(t,e){return t.$i||(t(e,_,O),t.$i=!0),O},O.locale=w,O.isDayjs=S,O.unix=function(t){return O(1e3*t)},O.en=D[g],O.Ls=D,O.p={},O}));
\ No newline at end of file
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ICMOBillWorkQtyStatus_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ICMOBillWorkQtyStatus_PDA.html"
index 0740185..5020134 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ICMOBillWorkQtyStatus_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ICMOBillWorkQtyStatus_PDA.html"
@@ -272,7 +272,7 @@
             if (sessionStorage.login != "login") {
                 layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
                     icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login_pda.html"; });
+                }, function () { window.location.href = "../../user/login.html"; });
             }
 
             //澶辫触鎻愮ず闊�
@@ -844,80 +844,96 @@
                 if (sBarCode != "") {
                     $('#HBarCode').val("");
                 }
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/Get_Gy_BarCodeBill_CusList",
-                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                    data: { "HBarCode": sBarCode, "user": HMaker },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            if ($("#HSourceBillNo").val() != result.data[0].HSourceBillNo) {
-                                playSound();
-                                layer.msg("鏉$爜瀵瑰簲鐨勭敓浜ц鍗曚笌褰撳墠璁㈠崟涓嶄竴鑷�", {
-                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
-                                }, function () {
-                                    $("#HBarCode").select();
-                                    $("#HBarCode").focus();
-                                });
-                            }
-                            else {
-                                var exists = BarCodelistOption.data.some(function (item) {
-                                    return item.HBarCode === sBarCode;
-                                });
-                                if (exists) {
-                                    playSound();
-                                    layer.msg("璇ユ潯鐮佸凡琚壂鎻忥紝涓嶈兘閲嶅鎵弿", {
-                                        icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "鎻愮ず"
-                                    }, function () {
-                                        $("#HBarCode").select();
-                                        $("#HBarCode").focus();
-                                    });
-                                    return; // 閫�鍑猴紝涓嶅啀鎵ц鍚庣画娣诲姞閫昏緫
-                                }
-                                var saveSuccess = save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());
-                                if (!saveSuccess) {
-                                    // 濡傛灉淇濆瓨澶辫触锛岀洿鎺ラ��鍑猴紝涓嶆墽琛屽悗闈换浣曢�昏緫
-                                    return;
-                                }
-                                var subarr = BarCodelistOption.data;
-                                subarr.push({
-                                    "HQty": 1, "HBarCode": sBarCode, "HMaterID": result.data[0].HItemID, "HMaterNumber": result.data[0].HNumber, "HMaterName": result.data[0].HName, "HMaterModel": result.data[0].HModel,
-                                    "HSourceBillNo": result.data[0].HSourceBillNo, "HSourceInterID": result.data[0].HSourceInterID,
-                                    "HSourceEntryID": result.data[0].HSourceEntryID, "HInterID": $("#HInterID").val()
-                                });
-
-                                BarCodelistOption.data = subarr;
-                                table.render(BarCodelistOption);
-                                listOption.data.forEach(function (item) {
-                                    item.鏁伴噺 = (parseFloat(item.鏁伴噺) || 0) + 1;
-                                    item.鏉$爜涓暟 = (parseFloat(item.鏉$爜涓暟) || 0) + 1;
-                                });
-                                table.render(listOption);
-                                $("#HQty").val((parseFloat($("#HQty").val()) || 0) + 1);
-                            }
-                        }
-                        else {
-                            playSound();
-                            layer.msg(result.Message, {
-                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
-                            }, function () {
-                                $("#HBarCode").select();
-                                $("#HBarCode").focus();
-                            });
-                        }
-                    },
-                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                    error: function (err) {
-                        playSound();
-                        layer.msg("閿欒锛�" + err, {
-                            icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
-                        }, function () {
-                            $("#HBarCode").select();
-                            $("#HBarCode").focus();
-                        });
-                    }
+                var exists = BarCodelistOption.data.some(function (item) {
+                    return item.HBarCode === sBarCode;
                 });
-                layer.closeAll("loading");
+                if (exists) {
+                    playSound();
+                    layer.msg("璇ユ潯鐮佸凡琚壂鎻忥紝涓嶈兘閲嶅鎵弿", {
+                        icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "鎻愮ず"
+                    }, function () {
+                        $("#HBarCode").select();
+                        $("#HBarCode").focus();
+                    });
+                    return; // 閫�鍑猴紝涓嶅啀鎵ц鍚庣画娣诲姞閫昏緫
+                }
+                save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());
+
+                //$.ajax({
+                //    type: "GET",
+                //    url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/Get_Gy_BarCodeBill_CusList",
+                //    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                //    data: { "HBarCode": sBarCode, "user": HMaker },
+                //    success: function (result) {
+                //        if (result.count == 1) {
+                //            if ($("#HSourceBillNo").val() != result.data[0].HSourceBillNo) {
+                //                playSound();
+                //                layer.msg("鏉$爜瀵瑰簲鐨勭敓浜ц鍗曚笌褰撳墠璁㈠崟涓嶄竴鑷�", {
+                //                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                //                }, function () {
+                //                    $("#HBarCode").select();
+                //                    $("#HBarCode").focus();
+                //                });
+                //            }
+                //            else {
+                //                var exists = BarCodelistOption.data.some(function (item) {
+                //                    return item.HBarCode === sBarCode;
+                //                });
+                //                if (exists) {
+                //                    playSound();
+                //                    layer.msg("璇ユ潯鐮佸凡琚壂鎻忥紝涓嶈兘閲嶅鎵弿", {
+                //                        icon: 5, time: 3000, offset: 'auto', skin: 'layui-layer-lan', title: "鎻愮ず"
+                //                    }, function () {
+                //                        $("#HBarCode").select();
+                //                        $("#HBarCode").focus();
+                //                    });
+                //                    return; // 閫�鍑猴紝涓嶅啀鎵ц鍚庣画娣诲姞閫昏緫
+                //                }
+                //                var saveSuccess = save_sub($('#HInterID').val(), sBarCode, $('#HSourceID').val());
+                //                if (!saveSuccess) {
+                //                    // 濡傛灉淇濆瓨澶辫触锛岀洿鎺ラ��鍑猴紝涓嶆墽琛屽悗闈换浣曢�昏緫
+                //                    return;
+                //                }
+                //                var subarr = BarCodelistOption.data;
+                //                subarr.push({
+                //                    "HQty": 1, "HBarCode": sBarCode, "HMaterID": result.data[0].HItemID, "HMaterNumber": result.data[0].HNumber, "HMaterName": result.data[0].HName, "HMaterModel": result.data[0].HModel,
+                //                    "HSourceBillNo": result.data[0].HSourceBillNo, "HSourceInterID": result.data[0].HSourceInterID,
+                //                    "HSourceEntryID": result.data[0].HSourceEntryID, "HInterID": $("#HInterID").val()
+                //                });
+
+                //                BarCodelistOption.data = subarr;
+                //                table.render(BarCodelistOption);
+                //                listOption.data.forEach(function (item) {
+                //                    item.鏁伴噺 = (parseFloat(item.鏁伴噺) || 0) + 1;
+                //                    item.鏉$爜涓暟 = (parseFloat(item.鏉$爜涓暟) || 0) + 1;
+                //                });
+                //                table.render(listOption);
+                //                $("#HQty").val((parseFloat($("#HQty").val()) || 0) + 1);
+                //            }
+                //        }
+                //        else {
+                //            playSound();
+                //            layer.msg(result.Message, {
+                //                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                //            }, function () {
+                //                $("#HBarCode").select();
+                //                $("#HBarCode").focus();
+                //            });
+                //        }
+                //    },
+                //    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                //    error: function (err) {
+                //        playSound();
+                //        layer.msg("閿欒锛�" + err, {
+                //            icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                //        }, function () {
+                //            $("#HBarCode").select();
+                //            $("#HBarCode").focus();
+                //        });
+                //    }
+                //});
+
+                //layer.closeAll("loading");
             }
 
 
@@ -961,9 +977,7 @@
             }
             //鎵弿鏉$爜淇濆瓨鏁版嵁鍒颁复鏃惰〃
             function save_sub(HInterID, HBarCode, HSourceID) {
-                var index = layer.load();
-                var isSuccess = false; // 榛樿澶辫触
-
+                var index = layer.load();              
                 $.ajax({
                     type: "GET",
                     url: GetWEBURL() + "Sc_MESBeginStepWorkBill/savrSc_ICMOBillWorkQtyStatus_Tmp_Sub",
@@ -976,27 +990,41 @@
                     },
                     success: function (data) {
                         if (data.count == 1) {
+
+                            var subarr = BarCodelistOption.data;
+                            subarr.push({
+                                "HQty": 1, "HBarCode": HBarCode, "HMaterID": data.data[0].HItemID, "HMaterNumber": data.data[0].HNumber, "HMaterName": data.data[0].HName, "HMaterModel": data.data[0].HModel,
+                                "HSourceBillNo": data.data[0].HICMOBillNo, "HSourceInterID": data.data[0].HICMOEntryID,
+                                "HSourceEntryID": data.data[0].HICMOInterID, "HInterID": $("#HInterID").val()
+                            });
+
+                            BarCodelistOption.data = subarr;
+                            table.render(BarCodelistOption);
+                            listOption.data.forEach(function (item) {
+                                item.鏁伴噺 = (parseFloat(item.鏁伴噺) || 0) + 1;
+                                item.鏉$爜涓暟 = (parseFloat(item.鏉$爜涓暟) || 0) + 1;
+                            });
+                            table.render(listOption);
+                            $("#HQty").val((parseFloat($("#HQty").val()) || 0) + 1);
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+
                             layer.close(index);
-                            layer.msg("鎵弿鎴愬姛", { icon: 1, time: 1500 });
-                            isSuccess = true;
+                            layer.msg("鎵弿鎴愬姛", { icon: 1, time: 1500 });                            
                         } else {
                             layer.close(index);
                             layer.msg(data.Message, {
                                 icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
-                            });
-                            isSuccess = false;
+                            });                          
                         }
                     },
                     error: function (err) {
                         layer.close(index);
                         layer.msg("淇濆瓨鏉$爜澶辫触锛�" + err.statusText, {
                             icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "绯荤粺閿欒"
-                        });
-                        isSuccess = false;
+                        });                       
                     }
                 });
-
-                return isSuccess; // 鍚屾杩斿洖缁撴灉
             }
             //#endregion
 
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
index d6d63a6..427126c 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\345\272\223\345\255\230\350\275\254\347\247\273/kf_InventoryTransfer.html"
@@ -137,7 +137,7 @@
                         <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Kf_MaterialUpperBill_PDA">
                             <ul class="layui-tab-title" lay-filter="tab-all">
                                 <li lay-id="1" style="padding:1px;">鍗曟嵁淇℃伅</li>
-                                <li lay-id="2" style="padding:1px;">涓婃灦淇℃伅</li>
+                                <!--<li lay-id="2" style="padding:1px;">涓婃灦淇℃伅</li>-->
                             </ul>
                             <div class="layui-tab-content">
                                 <!--鍗曟嵁淇℃伅-->
@@ -331,11 +331,11 @@
                         $('#HCarBarCode').removeAttr('disabled');
                         $('#HWHName').removeAttr('disabled');
                         $('#HStockPlaceName').removeAttr('disabled');
-                        $('#HBarCode').removeAttr('disabled');
                         $('#HWHID-BT').removeClass('layui-btn-disabled').attr('disabled', false);
                         $('#HSpID-BT').removeClass('layui-btn-disabled').attr('disabled', false);
 
                         // 绂佺敤鍏朵粬瀛楁
+                        $('#HBarCode').attr('disabled', 'disabled');
                         $('#HCarBarCode_2').attr('disabled', 'disabled');
                         $('#HWHName_2').attr('disabled', 'disabled');
                         $('#HStockPlaceName_2').attr('disabled', 'disabled');
@@ -1278,10 +1278,10 @@
 
         function GetHWHValue_2(obj) {
             if (obj.length > 0) {
-                $("#HWHName").val(obj[0].HName);
-                $("#HWHID").val(obj[0].HItemID);
-                $("#HStockPlaceName").val("");
-                $("#HStockPlaceID").val("0");
+                $("#HWHName_2").val(obj[0].HName);
+                $("#HWHID_2").val(obj[0].HItemID);
+                $("#HStockPlaceName_2").val("");
+                $("#HStockPlaceID_2").val("0");
                 if (obj[0].HSPFlag == 0) {
                     $("#HStockPlaceName").attr("disabled", "disabled");
                     $('#HSpID-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
index 17a9120..aa08354 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\240\346\211\230\345\215\225/Sc_DeletePackUnionBill_PDA.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>鍒犳墭鍗�</title>
+    <title>鐢熶骇鎷嗘墭鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -14,91 +14,94 @@
     <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>
     <style>
-        .layui-col-xs4 {
-            width: 12.333333%
-        }
-
         .layui-col-xs8 {
             width: 55.666667%;
         }
     </style>
 </head>
 <body>
-    <div class="layui-fluid" style="padding: 0px">
-        <div class="layui-card">
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
             <div class="layui-card-body" style="padding: 0px; height:800px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="background-color:#0085E8;">
-                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鍒犳墭鍗�</span>
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇鎷嗘墭鍗�</span>
                     </div>
-                    <div class="layui-form-item" style="padding:10px;margin:0px">
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <div class="layui-col-xs3">
-                                <label class="layui-form-label" style="width:50px;padding-left:0px;">鎵樻潯鐮�</label>
+                            <div class="layui-col-xs2">
+                                <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鎵樻潯鐮�</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
+                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">纭畾</button>
+                                <button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-tab" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">鏉$爜淇℃伅</li>
-                            <li lay-id="2">鍗曟嵁淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <!--鏉$爜淇℃伅-->
-                            <div class="layui-tab-item">
-                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
-                            </div>
-                            <!--鍗曟嵁淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_DeletePackUnionBill_PDA">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;">鎷嗘墭淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--鎷嗘墭淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">鎻愪氦</button>
-                                    </div>
-                                    <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                <!--鍗曟嵁淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎷嗘墭</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
                     </div>
+
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <!--澶辫触鎻愮ず闊�-->
                     <div id="" style="display:none;">
-                        <audio id="cs1" hidden controls>
+                        <audio id="cs" hidden controls>
                             <source src="../../../video/jingbao.wav" type="audio/ogg">
                         </audio>
                     </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
                     <div id="" style="display:none;">
                         <audio id="cs2" hidden controls>
                             <source src="../../../video/success.wav" type="audio/ogg">
@@ -121,13 +124,18 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
             var HInterID = $('#HInterID').val()
             var HBillNo = $('#HBillNo').val()
             var HBillType = '3783'
             var HMaker = sessionStorage["HUserName"]
-            var HStockOrgID = sessionStorage["OrganizationID"]
-            var option = [];
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var listOption = [];
+            var columns = "";
+            var HModName = "Sc_DeletePackUnionBill_PDA";
+            var ModRightName = "CE_DeletePackUnion";  //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                     //涓嶉渶瑕佹樉绀虹殑瀛楁
 
             //#endregion
 
@@ -135,43 +143,40 @@
             if (sessionStorage.login != "login") {
                 layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
                     icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../../user/login.html"; });
+                }, function () { window.location.href = "../../../user/login_pda.html"; });
             }
 
-            //#region 鍒濆鍖栫晫闈�
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 
-            set_ClearBill();
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
 
-            function set_ClearBill() {
-                $("#HMaker").val(HMaker);
-                $("#HMaker").attr("readonly", "readonly");
-                $("#HBillNo").attr("readonly", "readonly");
-                $("#HInterID").attr("readonly", "readonly");
-                element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
-                var pFocus = $("#HBarCode_Pack");
-                pFocus.focus();     //鑾峰彇鍏夋爣
-                pFocus.select();
-                set_InitGrid();     //鍒濆鍖栬〃鏍�
+            function CheckModRight() {
+                layer.load(3);
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                    success: function (d) {
+                        if (d.count == 1) {
+                        }
+                        else {
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+                layer.closeAll("loading");
             }
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#wl-table'
-                    , height: 'full-50'
-                    //, page: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    //, limits: [50, 500, 5000, 20000]
-                };
-            }
-
             //#endregion
 
             //澶辫触鎻愮ず闊�
             function playSound() {
                 console.log("playSound");
-                var audio = document.getElementById("cs1");
+                var audio = document.getElementById("cs");
                 audio.play();
                 audio.onended = function () {
                     // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
@@ -191,139 +196,114 @@
                 };
             }
 
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HBillType").val(HBillType);
+                $("#HInterID").val(0);
+                $("#HBillNo").val('');
+                HInterID = $('#HInterID').val()
+                HBillNo = $('#HBillNo').val()
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
+                set_InitGrid();         //鍒濆鍖栬〃鏍�
+
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+                var pFocus = $("#HBarCode_Pack");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 200
+                };
+            }
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(wl-table)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                $(".layui-table-body tr ").attr({ "style": "background:" });    //鍏朵粬tr鎭㈠鍘熸牱
+                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //閫変腑琛屾牱寮�
+                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //閫変腑radio鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            })
             //#endregion
 
-
-            //#region 鎵弿鎵樻潯鐮�
-
-            //鎸夊洖杞﹂敭杩斿洖淇℃伅
-            $('#HBarCode_Pack').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode_Pack();
-                }
-            });
-
-            //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
-            form.on('submit(cmdHBarCode_Pack)', function (data) {
-                GetMeesageByBarCode_Pack();
-            });
-
-            //鎵弿鎵樻潯鐮�
-            function GetMeesageByBarCode_Pack(obj) {
-                HBarCode_Pack = $('#HBarCode_Pack').val()
-
-                if (HBarCode_Pack == '') {
-                    playSound();
-                    layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉$爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
-                    data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-                    success: function (result) {
-                        var col = [];
-                        if (result.count == 1) {
-                            playSound_OK();
-                            $("#HInterID").val(result.data[0].HInterID);
-                            $("#HBillNo").val(result.data[0].HBillNo);
-                            $("#HBarCode_Pack").val(result.data[0].HBarCode_Pack);
-                            $("#HBarCode_Pack").attr("readonly", "readonly");
-                            document.getElementById("cmdHBarCode_Pack").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
-                            //鍏ㄥ眬鍙橀噺璧嬪��
-                            HInterID = $('#HInterID').val()
-                            HBillNo = $('#HBillNo').val()
-                            element.tabChange('tab-Sc_DeletePackUnionBill_PDA', '1');
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            var data = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in result.list) {
-                                data.push({ "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
-                            }
-                            //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
-                            col.push({ type: 'radio' });
-                            for (var i = 0; i < data.length; i++) {
-                                if (!patrn.test(data[i].name)) {
-                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        case 'DateTime':
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
-                                    }
-                                }
-                            }
-                            option.cols = [col];
-                            option.data = result.data;
-                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
-                            table.render(option);
-                            layer.load(3);
-                        }
-                        else {
-                            playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                            $('#HBarCode_Pack').val("");
-                            $("#HBarCode_Pack").select();
-                            $("#HBarCode_Pack").focus();     //鑾峰彇鍏夋爣
-                        }
-                        layer.closeAll("loading");
-                    },
-                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
-                });
-            }
 
             //#endregion
 
 
             //#region 鍔熻兘鎺т欢
 
-            //#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
-
-            form.on('submit(cmdLoadData)', function (data) {
-                HBarCode_Pack = $('#HBarCode_Pack').val()
-                document.getElementById("cmdLoadData").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
-                $.ajax(
-                    {
-                        type: "GET",
-                        url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
-                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                        data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.confirm(data.Message, {
-                                    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                    btn2: function () {
-                                        parent.location.href = "../../../../views/index_Mobile.html"
-                                    }//鍏抽棴
-                                }, function () {
-                                    window.location.reload();   //鍒锋柊褰撳墠椤甸潰
-                                });//鏂板
-                                layer.load(3);
+            //#region 鎷嗘墭
+            form.on('submit(cmdSaver)', function (data) {
+                document.getElementById("cmdSaver").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+                var sSubStr = table.cache['wl-table'];
+                var HBarCode_Pack = $('#HBarCode_Pack').val()
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/GetDeletePackUnionBill_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板', '鍏抽棴'],
+                                        btn2: function () {
+                                            parent.location.href = "../../../../views/index_Mobile.html";
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Sc_DeletePackUnionBill_PDA.html?HInterID=0');
+                                        });//鏂板
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    document.getElementById("cmdSaver").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                document.getElementById("cmdSaver").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
                             }
-                            else {
-                                playSound();
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                                document.getElementById("cmdLoadData").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
-                            }
-                            layer.closeAll("loading");  //鍏抽棴鍔犺浇灞�
-                        },
-                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                        error: function (err) {
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                            document.getElementById("cmdLoadData").disabled = false;
-                        }
-                    });
+                        });
+                    layer.closeAll("loading");
+                    return;
+                }
             });
 
             //#endregion
 
-            //#region 閫�鍑哄姛鑳芥帶浠�
+            //#region 閫�鍑�
 
             form.on('submit(cmdCancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -335,8 +315,154 @@
 
             //#endregion
 
+
+            //#region 鎵弿鎵樻潯鐮�
+
+            //鎵弿鎵樻潯鐮�
+            $('#HBarCode_Pack').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode_Pack();
+                }
+            });
+
+            //鎵樻潯鐮佹寜閽�
+            form.on('submit(HBarCode_Pack-BT)', function (data) {
+                GetMeesageByBarCode_Pack();
+            });
+
+            //鎵墭鏉$爜
+            function GetMeesageByBarCode_Pack(obj) {
+                var HBarCode_Pack = $('#HBarCode_Pack').val()
+                if (HBarCode_Pack == '') {
+                    playSound();
+                    layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode_Pack").select();
+                        $("#HBarCode_Pack").focus();
+                    });
+                    return;
+                }
+                layer.load(3)
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/Get_PackBarCode_DeletePackUnionBill_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) {
+                            playSound_OK();
+                            $("#HInterID").val(result.data[0].HInterID);
+                            $("#HBillNo").val(result.data[0].HBillNo);
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                            break;
+                                        default:
+
+                                            if (data[i].name == '鏁伴噺') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+                                            } else if (data[i].name == '鐗╂枡浠g爜') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
+                                            } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 220 });
+                                            }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode_Pack").select();
+                                $("#HBarCode_Pack").focus();
+                                listOption.cols = [[
+                                    { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                    , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                                ]];
+                                listOption.data = data;
+                                table.render(listOption);
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function (err) {
+                        playSound();
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode_Pack").select();
+                            $("#HBarCode_Pack").focus();
+                            listOption.cols = [[
+                                { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+                        });
+                    }
+                });
+                layer.closeAll("loading");
+            }
+
+            //#endregion
+
         });
 
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (sSubStr.length == 0) {
+                layer.msg("娌℃湁鎷嗘墭淇℃伅锛岃鍏堟壂鎻忔墭鏉$爜锛岀‘璁ゆ棤璇悗鍐嶆媶鎵橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            return true;
+        }
     </script>
 
 </body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
index 1e61fcf..5e298b4 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBillList_PDA.html"
@@ -22,36 +22,48 @@
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div class="layui-tab" lay-filter="tab-Sc_PackUnionBillList_PDA">
                         <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">缂撳瓨鍒楄〃</li>
+                            <li lay-id="1" style="padding:1px;">缂撳瓨鍒楄〃</li>
                         </ul>
                         <div class="layui-tab-content">
-                            <div class="layui-tab-item  layui-show">
+                            <!--缂撳瓨鍒楄〃-->
+                            <div class="layui-tab-item">
                                 <div class="layui-row">
                                     <div class="layui-col-xs12">
-                                        <table class="layui-hide" id="Temp-table" lay-filter="Temp-table"></table>
+                                        <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                        <table class="layui-hide" id="dj-table" lay-filter="dj-table"></table>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-form-item" style="margin-bottom: 20px;">
-                            <div class="layui-row">
-                                <div class="layui-col-xs2">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
-                                </div>
-                                <div class="layui-col-xs2">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                                </div>
-                                <div class="layui-col-xs2">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">鍒锋柊</button>
-                                </div>
-                                <div class="layui-col-xs2">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
-                                </div>
-                                <div class="layui-col-xs2">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdAdd">鏂板</button>
-                                </div>
-                            </div>
+                    </div>
+                    <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                        <div class="layui-col-xs2" style="margin-left:0px">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdModify" class="layui-btn" id="cmdModify">缂栬緫</button>
                         </div>
+                        <div class="layui-col-xs2" style="margin-left:5px">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                        </div>
+                        <div class="layui-col-xs2" style="margin-left:5px">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdRefresh" class="layui-btn" id="cmdRefresh">鍒锋柊</button>
+                        </div>
+                        <div class="layui-col-xs2" style="margin-left:5px">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
+                        <div class="layui-col-xs2" style="margin-left:5px">
+                            <button type="button" lay-submit="" style="width: 60px; float: right" lay-filter="cmdAdd" class="layui-btn" id="cmdAdd">鏂板</button>
+                        </div>
+                    </div>
+                    <!--澶辫触鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs" hidden controls>
+                            <source src="../../../video/jingbao.wav" type="audio/ogg">
+                        </audio>
+                    </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
+                    <div id="" style="display:none;">
+                        <audio id="cs2" hidden controls>
+                            <source src="../../../video/success.wav" type="audio/ogg">
+                        </audio>
                     </div>
                 </form>
             </div>
@@ -63,8 +75,6 @@
     }).extend({
         index: 'lib/index' //涓诲叆鍙fā鍧�
     }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-
-        //#region 鍏叡鍙橀噺
         var $ = layui.$
         , admin = layui.admin
         , layer = layui.layer
@@ -73,169 +83,270 @@
         , element = layui.element;
         var HBillType = '3783'
         var HMaker = sessionStorage["HUserName"]
-        var HStockOrgID = sessionStorage["OrganizationID"]
-        var option = [];
+        var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+        var listOption = [];    //缂撳瓨鍒楄〃
+        var columns = "";
+        var MvarReportTitle = "鐢熶骇缁勬墭鍗曠紦瀛樺垪琛�";
+        var HModName = "Sc_PackUnionBillList_PDA";
+        var ModRightName = "CE_PackUnion";    //妯″潡鏉冮檺鍙傛暟
+        var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+
+        //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+        if (sessionStorage.login != "login") {
+            layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            }, function () { window.location.href = "../../user/login_pda.html"; });
+        }
+
+        //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+        //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+        CheckModRight();
+
+        function CheckModRight() {
+            layer.load(3);
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                data: { "ModRightName": ModRightName, "HUserName": HMaker },
+                success: function (d) {
+                    if (d.count == 1) {
+                    }
+                    else {
+                        layer.msg(d.Message, {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
+                    }
+                },
+                complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+            });
+            layer.closeAll("loading");
+        }
+        //#endregion
+
+        //澶辫触鎻愮ず闊�
+        function playSound() {
+            console.log("playSound");
+            var audio = document.getElementById("cs");
+            audio.play();
+            audio.onended = function () {
+                // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                audio.pause();
+                audio.currentTime = 0;
+            };
+        }
+        //鎴愬姛鎻愮ず闊�
+        function playSound_OK() {
+            console.log("playSound_OK");
+            var audio = document.getElementById("cs2");
+            audio.play();
+            audio.onended = function () {
+                // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
+                audio.pause();
+                audio.currentTime = 0;
+            };
+        }
 
         //#region 鍒濆鍖栫晫闈�
 
         set_ClearBill();
 
         function set_ClearBill() {
+            //榛樿鏄剧ず椤甸潰
             element.tabChange('tab-Sc_PackUnionBillList_PDA', '1');
-            //鍒濆鍖栬〃鏍�
-            set_InitGrid();
-            //璇诲彇鍗曟嵁鍒楄〃
-            DisBillEntryList();
+            set_InitGrid();     //鍒濆鍖栬〃鏍�
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
         }
 
-        //#region 鍒濆鍖栬〃鏍兼柟娉�
+        //鍒濆鍖栬〃鏍�
         function set_InitGrid() {
-            option = {
-                elem: '#Temp-table'
-                , height: 'full-50'
-                //, page: true
+            //缂撳瓨鍒楄〃
+            listOption = {
+                elem: '#dj-table'
+                , height: 'full-150'
+                , page: true //寮�鍚垎椤�
                 , cellMinWidth: 90
                 , limit: 50
-                //, limits: [50, 500, 5000, 20000]
             };
         }
 
+        //#region 鐐瑰嚮琛岄�変腑楂樹寒
+        table.on('row(dj-table)', function (obj) {
+            //閫変腑琛屾敼鍙橀鑹�
+            $(".layui-table-body tr ").attr({ "style": "background:" });    //鍏朵粬tr鎭㈠鍘熸牱
+            obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //閫変腑琛屾牱寮�
+            obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //閫変腑radio鏍峰紡
+            $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+        })
         //#endregion
 
         //#endregion
 
-
-        //#region 缂撳瓨鍒楄〃鐣岄潰    鎺т欢浜嬩欢
 
         //#region 缂栬緫鍔熻兘鎺т欢
-        form.on('submit(cmdModify)', function () {
-            var checkStatus = table.checkStatus('Temp-table')
-                , data = checkStatus.data;
-            layer.open({
-                type: 2
-                , area: ['100%', '100%']
-                , title: '鐢熶骇缁勬墭鍗�'
-                , shade: 0.6 //閬僵閫忔槑搴�
-                , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                , content: ['../../../WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html?HInterID_Temp=' + data[0].HInterID + '& HBillNo_Temp=' + data[0].HBillNo + '& HBarCode_Pack_Temp=' + data[0].HBarCode_Pack, 'yes']
-                , resize: false
-                , cancel: function () {
-                    $(".layui-btn").removeClass("layui-btn-disabled");
-                }
-            })
-        });
-        //#endregion
 
-        //#region 鍒犻櫎鍔熻兘鎺т欢
-        form.on('submit(cmdDelete)', function () {
-            var checkStatus = table.checkStatus('Temp-table')
+        form.on('submit(cmdModify)', function () {
+            var checkStatus = table.checkStatus('dj-table')
                 , data = checkStatus.data;
             if (checkStatus.data.length === 1) {
-                layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紒", { title: "鍒犻櫎纭" }, function (index) {
-                    var sInterID = data[0].HInterID;
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇缁勬墭鍗�'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html?OperationType=2&HBarCode_Pack_Temp=' + data[0].HBarCode_Pack, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        $(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            }
+            else {
+                layer.msg('璇峰厛閫変腑涓�琛屾暟鎹紒');
+            }
+        });
+
+        //#endregion
+
+
+        //#region 鍒犻櫎鍔熻兘鎺т欢
+
+        form.on('submit(cmdDelete)', function () {
+            var checkStatus = table.checkStatus('dj-table')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                    layer.load(3)
                     $.ajax(
                         {
                             type: "GET",
                             url: GetWEBURL() + "/WEBSController/DeleteTemp_PackUnionBill_Json",
-                            async: true,
-                            data: { "HInterID": sInterID },
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": data[0].HInterID },
                             dataType: "json",
                             success: function (data) {
                                 if (data.count == 1) {
                                     layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        DisBillEntryList(); //鏄剧ず琛ㄤ綋鏄庣粏
-                                        //// 寰楀埌frame绱㈠紩
-                                        //var index = layer.getFrameIndex(window.name);
-                                        ////鍏抽棴褰撳墠frame
-                                        //layer.close(index);
-                                        ////淇敼鎴愬姛鍚庡埛鏂扮晫闈�
-                                        //window.location.reload();
+                                        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+                                        DisTempEntryList();
                                     });
                                 }
                                 else {
-                                    layer.msg(data.Message, { icon: 2 });
+                                    playSound();
+                                    layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                                 }
                             },
                             complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                             error: function (err) {
-                                layer.msg('閿欒' + err, {
-                                    icon: 5,
-                                    time: 20000
-                                }, function () {
-                                });
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         });
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛岃褰曪紝杩涜鍒犻櫎锛�');
+                    layer.closeAll("loading");
+                })
+            }
+            else {
+                layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
             }
         });
+
         //#endregion
 
+
         //#region 鍒锋柊鍔熻兘鎺т欢
+
         form.on('submit(cmdRefresh)', function () {
-            DisBillEntryList();
+            //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+            DisTempEntryList();
         });
 
-        function DisBillEntryList() {
-            var ajaxLoad = layer.load();
+        //鏄剧ず缂撳瓨鍒楄〃淇℃伅
+        function DisTempEntryList() {
+            layer.load(3)
             $.ajax({
                 type: "GET",
                 url: GetWEBURL() + '/WEBSController/GetSc_PackUnionBill_TempList_Json',
+                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                 data: { "HBillType": HBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-                success: function (data1) {
+                success: function (result) {
+                    var data = [];
                     var col = [];
-                    if (data1.count == 1) {
-                        var data = [];
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                         //缁欑┖鐨勬暟缁勮祴鍊�
-                        for (var key in data1.list) {
-                            data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        for (var key in result.list) {
+                            //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                            data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                            var patrn = new RegExp(/^h/i);
+                            if (patrn.test(result.list[key].ColmCols)) {
+                                titleData[key] = result.list[key].ColmCols;
+                            }
                         }
-                        //鍒ゆ柇鏄惁鏄函鑻辨枃
-                        var patrn = new RegExp("[\u4E00-\u9FA5]+");
+
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                         col.push({ type: 'radio' });
                         for (var i = 0; i < data.length; i++) {
-                            if (!patrn.test(data[i].name)) {
-                                col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                            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].name, 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 });
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'left', 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].name, title: data[i].name, align: 'center', sort: true });
+
+                                    if (data[i].name == '鎵樻潯鐮�') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 200 });
+                                    } else if (data[i].name == '鍗曟嵁鍙�' || data[i].name == '缁勭粐') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 150 });
+                                    } else {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'left' });
+                                    }
                                 }
                             }
                         }
-                        option.cols = [col];
-                        option.data = data1.data;
-                        table.cache['Temp-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
-                        table.render(option);
-                        layer.close(ajaxLoad);
-                    } else {
-                        layer.close(ajaxLoad);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                        columns = col;
+                        listOption.cols = [columns];
+                        listOption.data = result.data;
+                        //listOption.totalRow = true;
+                        table.cache['dj-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                        table.render(listOption);
+                    }
+                    else {
+                        listOption.cols = [[
+                            { field: '鎵樻潯鐮�', title: '鎵樻潯鐮�', width: 100 }
+                            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100 }
+                            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 100 }
+                            , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+                            , { field: '缁勭粐', title: '缁勭粐', width: 100 }
+                        ]];
+                        listOption.data = data;
+                        //listOption.totalRow = true;
+                        table.render(listOption);
+                        //layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 },
-                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                error: function () {
-                    layer.close(ajaxLoad);
-                    layer.alert("鍒锋柊缂撳瓨鍒楄〃淇℃伅锛屾帴鍙h姹傚け璐�!", { icon: 5 });
-                }
+                complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
             });
+            layer.closeAll("loading");
         }
 
         //#endregion
 
+
         //#region 閫�鍑哄姛鑳芥帶浠�
+
         form.on('submit(cmdCancel)', function () {
             layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                parent.location.href = "../../../../views/index_Mobile.html"
+                parent.location.href = "../../../../views/index_Mobile.html";
             });
         })
+
         //#endregion
 
         //#region 鏂板鍔熻兘鎺т欢
@@ -257,10 +368,7 @@
 
         //#endregion
 
-        //#endregion
-
     });
-
     </script>
 
 </body>
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
index 56f4990..95da515 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\273\204\346\211\230\345\215\225/Sc_PackUnionBill_PDA.html"
@@ -14,107 +14,126 @@
     <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>
     <style>
-        .layui-col-xs4 {
-            width: 12.333333%
-        }
-
         .layui-col-xs8 {
             width: 55.666667%;
         }
     </style>
 </head>
 <body>
-    <div class="layui-fluid" style="padding: 0px">
-        <div class="layui-card">
+    <div class="layui-fluid" style="padding:0">
+        <div class="layui-card" style="padding: 1px">
             <div class="layui-card-body" style="padding: 0px; height:800px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="background-color:#0085E8;">
                         <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐢熶骇缁勬墭鍗�</span>
                     </div>
-                    <div class="layui-form-item" style="padding:10px;margin:0px">
+                    <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
-                            <div class="layui-col-xs3">
-                                <label class="layui-form-label" style="width:50px;padding-left:0px;">鎵樻潯鐮�</label>
+                            <div class="layui-col-xs2">
+                                <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鎵樻潯鐮�</label>
                             </div>
                             <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" autocomplete="off" class="layui-input">
+                                <input type="text" name="HBarCode_Pack" id="HBarCode_Pack" lay-verify="HBarCode_Pack" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                             </div>
                             <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode_Pack" id="cmdHBarCode_Pack">纭畾</button>
+                                <button type="button" lay-submit="" lay-filter="HBarCode_Pack-BT" class="layui-btn" id="HBarCode_Pack-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-form-item" style="padding:10px;margin:0px">
-                        <div class="layui-row">
-                            <div class="layui-col-xs3">
-                                <label class="layui-form-label" style="width:50px;padding-left:0px;">鏉$爜</label>
-                            </div>
-                            <div class="layui-col-xs8">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
-                            </div>
-                            <div class="layui-col-xs2">
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdHBarCode">纭畾</button>
+                        <div class="layui-row" style="margin-top: 5px; margin-bottom: 0px;">
+                            <div class="layui-row">
+                                <div class="layui-col-xs2">
+                                    <label class="layui-form-label" style="width: 45px;padding-left: 0px;">鏉$爜</label>
+                                </div>
+                                <div class="layui-col-xs8">
+                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                </div>
+                                <div class="layui-col-xs2">
+                                    <button type="button" lay-submit="" lay-filter="HBarCode-BT" class="layui-btn" id="HBarCode-BT" style="width: 45px; margin-left: 8px;padding-left:12px">OK</button>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="layui-tab" lay-filter="tab-Sc_PackUnionBill_PDA">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1">缁勬墭淇℃伅</li>
-                            <li lay-id="2">鍗曟嵁淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <!--缁勬墭淇℃伅-->
-                            <div class="layui-tab-item">
-                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
-                            </div>
-                            <!--鍗曟嵁淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input">
+                        <div class="layui-tab layui-col-xs12" style="margin-top:5px;" lay-filter="tab-Sc_PackUnionBill_PDA">
+                            <ul class="layui-tab-title" lay-filter="tab-all">
+                                <li lay-id="1" style="padding:1px;">缁勬墭淇℃伅</li>
+                                <li lay-id="2" style="padding:1px;">鍗曟嵁淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <!--缁勬墭淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs12">
+                                            <div class="layui-form-item" style="padding:0px;margin:0px"></div>
+                                            <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
+                                        </div>
                                     </div>
                                 </div>
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
-                                    </div>
-                                    <div class="layui-col-xs8 layui-input-inline mobile">
-                                        <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
-                                <div class="layui-row">
-                                    <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdLoadData" id="cmdLoadData">鎻愪氦</button>
-                                    </div>
-                                    <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                                    </div>
-                                    <div class="layui-col-xs3">
-                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
+                                <!--鍗曟嵁淇℃伅-->
+                                <div class="layui-tab-item">
+                                    <div class="layui-form-item" style="padding: 0px; margin: 0px">
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input name="HDate" id="HDate" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍒跺崟浜�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HMaker" id="HMaker" lay-verify="HMaker" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁鍙�</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HBillNo" id="HBillNo" lay-verify="HBillNo" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁ID</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HInterID" id="HInterID" lay-verify="HInterID" value="0" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                            </div>
+                                        </div>
+                                        <div class="layui-row">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width:60px;padding-left:0px;">缁勭粐</label>
+                                            </div>
+                                            <div class="layui-col-xs9">
+                                                <input type="text" name="HStockOrgName" id="HStockOrgName" lay-verify="HStockOrgName" autocomplete="off" class="layui-input" style="border-radius: 5px;background-color:#efefef4d;" disabled>
+                                                <input type="hidden" name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID" value="0" autocomplete="off" class="layui-input">
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+                        <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+                            <button type="button" lay-submit="" lay-filter="cmdSaver" class="layui-btn" id="cmdSaver">鎻愪氦</button>
+                            <button type="button" lay-submit="" lay-filter="cmdDelete" class="layui-btn" id="cmdDelete">鍒犻櫎</button>
+                            <button type="button" lay-submit="" lay-filter="cmdCancel" class="layui-btn" id="cmdCancel">閫�鍑�</button>
+                        </div>
                     </div>
+
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HBillType" id="HBillType">
+                    <input type="hidden" name="HBillSubType" id="HBillSubType">
+                    <!--澶辫触鎻愮ず闊�-->
                     <div id="" style="display:none;">
-                        <audio id="cs1" hidden controls>
+                        <audio id="cs" hidden controls>
                             <source src="../../../video/jingbao.wav" type="audio/ogg">
                         </audio>
                     </div>
+                    <!--鎴愬姛鎻愮ず闊�-->
                     <div id="" style="display:none;">
                         <audio id="cs2" hidden controls>
                             <source src="../../../video/success.wav" type="audio/ogg">
@@ -137,15 +156,24 @@
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
             var HInterID = $('#HInterID').val()
             var HBillNo = $('#HBillNo').val()
             var HBillType = '3783'
-            var HBarCode_Pack = sessionStorage["HBarCode_Pack"]
+            var HBillSubType = '1'  //瀛愮被鍨嬶紙1瑁呯銆佹爣鍑嗙粍鎵樸��2缁勬墭锛�
             var HMaker = sessionStorage["HUserName"]
-            var HStockOrgID = sessionStorage["OrganizationID"]
-            var SourceFlag = sessionStorage["SourceFlag"];  //鎵樻潯鐮佸凡鎵爣蹇�
-            var option = [];
+            var HStockOrgID = sessionStorage["OrganizationID"]  //缁勭粐ID
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HMaterNumber_Pack = ""; //鎵樻潯鐮佸搴旂墿鏂欎唬鐮�
+            var listOption = [];
+            var columns = "";
+            var HModName = "Sc_PackUnionBill_PDA";
+            var ModRightName = "CE_PackUnion";  //妯″潡鏉冮檺鍙傛暟
+            var titleData = [];                     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();
+            var OperationType = params[params[0]] == null ? 1 : params[params[0]];  //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鏁版嵁绫诲瀷锛�1鏂板銆�2浠庣紦瀛樺垪琛ㄤ腑杩斿洖锛�
+            var HBarCode_Pack_Temp = params[params[1]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
 
             //#endregion
 
@@ -153,100 +181,40 @@
             if (sessionStorage.login != "login") {
                 layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
                     icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../../user/login.html"; });
+                }, function () { window.location.href = "../../../user/login_pda.html"; });
             }
 
-            //#region 鍒濆鍖栫晫闈�
+            //#region   鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
 
-            set_ClearBill();
+            //鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+            CheckModRight();
 
-            function set_ClearBill() {
-                $("#HMaker").val(HMaker);
-                $("#HMaker").attr("readonly", "readonly");
-                $("#HBillNo").attr("readonly", "readonly");
-                $("#HInterID").attr("readonly", "readonly");
-                element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
-                var pFocus = $("#HBarCode_Pack");
-                pFocus.focus();     //鑾峰彇鍏夋爣
-                pFocus.select();
-                set_InitGrid();     //鍒濆鍖栬〃鏍�
-            }
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            function set_InitGrid() {
-                option = {
-                    elem: '#wl-table'
-                    , height: 'full-50'
-                    //, page: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    //, limits: [50, 500, 5000, 20000]
-                };
-            }
-
-            //#endregion
-
-            //#region   浠庣紦瀛樺垪琛ㄤ腑杩斿洖淇℃伅
-            function getBillTemp() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-            var params = getBillTemp();
-            var HInterID_Temp = params[params[0]];      //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁ID
-            var HBillNo_Temp = params[params[1]];       //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鍗曟嵁鍙�
-            var HBarCode_Pack_Temp = params[params[2]]; //浠庣紦瀛樺垪琛ㄤ腑杩斿洖鎵樻潯鐮�
-
-            //#endregion
-
-            //鍒ゆ柇鏄惁鏂板
-            if (HInterID_Temp == null || HInterID_Temp == 0) {
-                //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
+            function CheckModRight() {
+                layer.load(3);
                 $.ajax({
                     type: "GET",
-                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
-                    data: { "HBillType": HBillType },
+                    url: GetWEBURL() + "/WEBSController/CheckModRight_ERP_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "ModRightName": ModRightName, "HUserName": HMaker },
                     success: function (d) {
                         if (d.count == 1) {
-                            $("#HInterID").val(d.data[0].HInterID);
-                            $("#HBillNo").val(d.data[0].HBillNo);
-                            HInterID = $('#HInterID').val()
-                            HBillNo = $('#HBillNo').val()
                         }
                         else {
-                            layer.msg(d.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            layer.msg(d.Message, {
+                                icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () { parent.location.href = "../../../../views/index_Mobile.html"; });
                         }
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
                 });
-                SourceFlag = false;
+                layer.closeAll("loading");
             }
-            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
-            else {
-                $('#HInterID').val(HInterID_Temp)
-                $('#HBillNo').val(HBillNo_Temp)
-                $('#HBarCode_Pack').val(HBarCode_Pack_Temp)
-                $("#HBarCode_Pack").attr("readonly", "readonly");
-                HInterID = $('#HInterID').val()
-                HBillNo = $('#HBillNo').val()
-                HBarCode_Pack = $('#HBarCode_Pack').val()
-                $("#HBarCode").focus();
-                element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
-
-                //鏄剧ず琛ㄤ綋鏄庣粏
-                DisBillEntryList();
-                SourceFlag = true;
-            }
+            //#endregion
 
             //澶辫触鎻愮ず闊�
             function playSound() {
                 console.log("playSound");
-                var audio = document.getElementById("cs1");
+                var audio = document.getElementById("cs");
                 audio.play();
                 audio.onended = function () {
                     // 褰撻煶棰戞挱鎶ュ畬鎴愭椂锛岃皟鐢� pause 鍜岃缃� currentTime 涓� 0 浠ュ仠姝㈡挱鎶ュ苟閲嶇疆
@@ -266,174 +234,102 @@
                 };
             }
 
+            //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
+            function set_ClearBill() {
+                //琛ㄥご鍒濆鍖栬祴鍊�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HStockOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HStockOrgName").val(sessionStorage["Organization"]);
+                $("#HBillType").val(HBillType);
+                $("#HBillSubType").val(HBillSubType);
+
+                //榛樿鏄剧ず椤甸潰
+                element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+                set_InitDate();         //鍒濆鍖栬〃鍗曟椂闂�
+                set_InitGrid();         //鍒濆鍖栬〃鏍�
+
+                var data = [];
+                listOption.cols = [[
+                    { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                    , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                    , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                ]];
+                listOption.data = data;
+                table.render(listOption);
+
+                //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
+                var pFocus = $("#HBarCode_Pack");
+                pFocus.select();
+                pFocus.focus();     //鑾峰彇鍏夋爣
+            }
+
+            //鍒濆鍖栬〃鍗曟椂闂存彃浠�
+            function set_InitDate() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                listOption = {
+                    elem: '#wl-table'
+                    //, toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , height: 'full-60'
+                    , cellMinWidth: 90
+                    , limit: 200
+                };
+            }
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(wl-table)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                $(".layui-table-body tr ").attr({ "style": "background:" });    //鍏朵粬tr鎭㈠鍘熸牱
+                obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');   //閫変腑琛屾牱寮�
+                obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");   //閫変腑radio鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" }); //鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+            })
             //#endregion
 
-
-            //#region 鎵弿鎵樻潯鐮�
-
-            //鎸夊洖杞﹂敭杩斿洖淇℃伅
-            $('#HBarCode_Pack').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode_Pack();
-                }
-            });
-
-            //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
-            form.on('submit(cmdHBarCode_Pack)', function (data) {
+            //鍒ゆ柇鏄惁鏂板锛岃幏鍙栨渶澶у崟鎹彿
+            if (HInterID != 0) {
+            }
+            //浠庣紦瀛樺垪琛ㄧ紪杈戝姛鑳借烦杞嚦鍗曟嵁妯″潡
+            else if (OperationType == 2) {
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HBarCode_Pack").val(HBarCode_Pack_Temp);
                 GetMeesageByBarCode_Pack();
-            });
-
-            //鎵弿鎵樻潯鐮�
-            function GetMeesageByBarCode_Pack(obj) {
-                HBarCode_Pack = $('#HBarCode_Pack').val()
-
-                if (HBarCode_Pack == '') {
-                    playSound();
-                    layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉$爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-
+                //鏄剧ず琛ㄤ綋鏄庣粏
+                DisBillEntryList();
+                element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+            }
+            else {
+                //鑾峰彇鏈�澶у崟鎹甀D銆佸崟鎹彿
                 $.ajax({
                     type: "GET",
-                    url: GetWEBURL() + "/WEBSController/Get_PackBarCode_PackUnionBill_Json",
-                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            playSound_OK();
-                            $("#HBarCode_Pack").val(result.data.hBarCodeField);
-                            $("#HBarCode_Pack").attr("readonly", "readonly");
-                            $("#HBarCode").select();
-                            $("#HBarCode").focus();     //鑾峰彇鍏夋爣
-                            document.getElementById("cmdHBarCode_Pack").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
-                            element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            DisBillEntryList();
-                            SourceFlag = true;
-                            layer.load(3);
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HInterID").val(d.data[0].HInterID);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
                         }
                         else {
-                            playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                            $('#HBarCode_Pack').val("");
-                            $("#HBarCode_Pack").select();
-                            $("#HBarCode_Pack").focus();     //鑾峰彇鍏夋爣
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
-                        layer.closeAll("loading");
                     },
                     complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
-                });
-            }
-
-            //#endregion
-
-
-            //#region 鎵弿鐗╂枡鏉$爜
-
-            //鎸夊洖杞﹂敭杩斿洖淇℃伅
-            $('#HBarCode').on('keydown', function (event) {
-                if (event.keyCode == 13) {
-                    GetMeesageByBarCode();
-                }
-            });
-
-            //鐐瑰嚮鎸夐挳杩斿洖淇℃伅
-            form.on('submit(cmdHBarCode)', function (data) {
-                GetMeesageByBarCode();
-            });
-
-            //鎵弿鐗╂枡鏉$爜
-            function GetMeesageByBarCode(obj) {
-                var sBarCode = $('#HBarCode').val()
-
-                if (sBarCode == '') {
-                    playSound();
-                    layer.msg("鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                else if (SourceFlag == false) {
-                    playSound();
-                    layer.msg("娌℃湁鎵弿鎵樻潯鐮侊紝璇峰厛鎵弿鎵樻潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-                if (sBarCode != "") {
-                    $('#HBarCode').val("");
-                }
-
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + "/WEBSController/Get_BarCode_PackUnionBill_Json",
-                    data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            playSound_OK();
-                            $("#HBarCode").select();
-                            $("#HBarCode").focus();     //鑾峰彇鍏夋爣
-                            element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
-                            //鏄剧ず琛ㄤ綋鏄庣粏
-                            DisBillEntryList();
-                            layer.load(3)
-                        }
-                        else {
-                            playSound();
-                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
-                });
-            }
-
-            //#endregion
-
-
-            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
-
-            function DisBillEntryList() {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    type: "GET",
-                    url: GetWEBURL() + '/WEBSController/GetBillEntry_Tmp_Pack_Json',
-                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
-                    success: function (data1) {
-                        var col = [];
-                        if (data1.count == 1) {
-                            var data = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                            }
-                            //鍒ゆ柇鏄惁鏄函鑻辨枃
-                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
-                            col.push({ type: 'radio' });
-                            for (var i = 0; i < data.length; i++) {
-                                if (!patrn.test(data[i].name)) {
-                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        case 'DateTime':
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                            break;
-                                        default:
-                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true });
-                                    }
-                                }
-                            }
-                            option.cols = [col];
-                            option.data = data1.data;
-                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
-                            table.render(option);
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    },
-                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                    error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
                 });
             }
 
@@ -442,80 +338,86 @@
 
             //#region 鍔熻兘鎺т欢
 
-            //#region 鎻愪氦涓婁紶鍔熻兘鎺т欢
-
-            form.on('submit(cmdLoadData)', function (data) {
-                document.getElementById("cmdLoadData").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
-                $.ajax(
-                    {
-                        type: "GET",
-                        url: GetWEBURL() + "/WEBSController/set_SavePackUnionBill_Json",
-                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                        data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.confirm(data.Message, {
-                                    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                    btn2: function () {
-                                        parent.location.href = "../../../../views/index_Mobile.html"
-                                    }//鍏抽棴
-                                }, function () {
-                                    HInterID_Temp = 0;
-                                    window.location.reload();   //鍒锋柊褰撳墠椤甸潰
-                                });//鏂板
-                                layer.load(3);
-                            }
-                            else {
-                                playSound();
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                                document.getElementById("cmdLoadData").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
-                            }
-                            layer.closeAll("loading");  //鍏抽棴鍔犺浇灞�
-                        },
-                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
-                        error: function (err) {
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
-                            document.getElementById("cmdLoadData").disabled = false;
-                        }
-                    });
-            });
-
-            //#endregion
-
-            //#region 鍒犻櫎鍔熻兘鎺т欢
-
-            form.on('submit(cmdDelete)', function () {//鍒犻櫎
-                var checkStatus = table.checkStatus('wl-table')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    layer.confirm("纭畾瑕佸垹闄ゅ悧锛屽垹闄ゅ悗灏嗕笉鍙仮澶嶏紝纭畾瑕佺户缁搷浣滐紵", { title: "鍒犻櫎纭" }, function (index) {
-                    var HBarCode = data[0].HBarCode
+            //#region 鎻愪氦
+            form.on('submit(cmdSaver)', function (data) {
+                document.getElementById("cmdSaver").disabled = true;   //鎸夐挳鍙樹负涓嶅彲缂栬緫鐘舵��
+                var sSubStr = table.cache['wl-table'];
+                var HBarCode_Pack = $('#HBarCode_Pack').val()
+                if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
+                {
+                    layer.load(3);
                     $.ajax(
                         {
                             type: "GET",
-                            url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
-                            async: true,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
-                            data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
+                            url: GetWEBURL() + "/WEBSController/set_SavePackUnionBill_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                             dataType: "json",
                             success: function (data) {
-                                if (data.count == 1) {  //鎴愬姛
-                                    DisBillEntryList(); //鏄剧ず琛ㄤ綋鏄庣粏
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    layer.confirm(data.Message, {
+                                        icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板','鍏抽棴'],
+                                        btn2: function () {
+                                            parent.location.href = "../../../../views/index_Mobile.html";
+                                        }//鍏抽棴
+                                    }
+                                        , function () {
+                                            location.replace('Sc_PackUnionBill_PDA.html?OperationType=1&HInterID=0');
+                                        });//鏂板
                                 }
                                 else {
-                                    layer.msg(data.Message, { icon: 2 });
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    document.getElementById("cmdSaver").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
                                 }
                             },
                             complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
                             error: function (err) {
-                                layer.msg('閿欒' + err, {
-                                    icon: 5,
-                                    time: 20000
-                                }, function () {
-                                });
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                document.getElementById("cmdSaver").disabled = false;  //鎸夐挳鍙樹负鍙紪杈戠姸鎬�
                             }
                         });
-                        layer.close(index)
+                    layer.closeAll("loading");
+                    return;
+                }
+            });
+
+            //#endregion
+
+            //#region 鍒犻櫎
+
+            form.on('submit(cmdDelete)', function () {
+                var checkStatus = table.checkStatus('wl-table')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length == 1) {
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾墍鏈夋壂鐮佽褰曪紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var HBarCode = data[0].HBarCode
+
+                        layer.load(3)
+                        $.ajax(
+                            {
+                                type: "Get",
+                                url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
+                                async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                                data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
+                                dataType: "json",
+                                success: function (data) {
+                                    if (data.count == 1) {
+                                        layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            //鏄剧ず琛ㄤ綋鏄庣粏
+                                            DisBillEntryList();
+                                        });
+                                    }
+                                    else {
+                                        playSound();
+                                        layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    }
+                                },
+                                complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                                error: function (err) {
+                                    layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            });
+                        layer.closeAll("loading");
                     })
                 }
                 else {
@@ -525,11 +427,18 @@
 
             //#endregion
 
-            //#region 閫�鍑哄姛鑳芥帶浠�
+            //#region 閫�鍑�
 
             form.on('submit(cmdCancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../../views/index_Mobile.html";
+                    if (OperationType == 2) {
+                        var index = parent.layer.getFrameIndex(window.name);    //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                        parent.location.reload();                               //鍒锋柊鐖堕〉闈紝娉ㄦ剰涓�瀹氳鍦ㄥ叧闂綋鍓峣frame灞備箣鍓嶆墽琛屽埛鏂�
+                        parent.layer.close(index);                              //鍐嶆墽琛屽叧闂�
+                    }
+                    else {
+                        parent.location.href = "../../../../views/index_Mobile.html";
+                    }
                 });
             })
 
@@ -537,8 +446,325 @@
 
             //#endregion
 
+
+            //#region 鎵弿鎵樻潯鐮�
+
+            //鎵弿鎵樻潯鐮�
+            $('#HBarCode_Pack').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode_Pack();
+                }
+            });
+
+            //鎵樻潯鐮佹寜閽�
+            form.on('submit(HBarCode_Pack-BT)', function (data) {
+                GetMeesageByBarCode_Pack();
+            });
+
+            //鎵墭鏉$爜
+            function GetMeesageByBarCode_Pack(obj) {
+                var HBarCode_Pack = $('#HBarCode_Pack').val()
+                if (HBarCode_Pack == '') {
+                    playSound();
+                    layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇锋壂鎻忔墭鏉$爜锛�", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode_Pack").select();
+                        $("#HBarCode_Pack").focus();
+                    });
+                    return;
+                }
+                layer.load(3)
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/Get_PackBarCode_PackUnionBill_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            playSound_OK();
+                            $("#HInterID").val(result.data[0].HInterID);
+                            $("#HBillNo").val(result.data[0].HBillNo);
+                            HInterID = $('#HInterID').val()
+                            HBillNo = $('#HBillNo').val()
+                            HMaterNumber_Pack = result.data[0].HMaterNumber
+
+                            $("#HBarCode_Pack").attr("disabled", "disabled");
+                            $('#HBarCode_Pack-BT').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                            //鏄剧ず琛ㄤ綋鏄庣粏
+                            DisBillEntryList();
+                            element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+                        }
+                        else {
+                            playSound();
+                            layer.msg(result.Message, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode_Pack").select();
+                                $("#HBarCode_Pack").focus();
+                            });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function (err) {
+                        playSound();
+                        layer.msg("閿欒锛�" + err, {
+                            icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode_Pack").select();
+                            $("#HBarCode_Pack").focus();
+                        });
+                    }
+                });
+                layer.closeAll("loading");
+            }
+
+            //#endregion
+
+
+            //#region 鎵弿寰呯粍鎵樻潯鐮�
+
+            //鎵弿寰呯粍鎵樻潯鐮�
+            $('#HBarCode').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    GetMeesageByBarCode();
+                }
+            });
+
+            //寰呯粍鎵樻潯鐮佹寜閽�
+            form.on('submit(HBarCode-BT)', function (data) {
+                GetMeesageByBarCode();
+                $("#HBarCode").select();
+                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+            });
+
+            //鎵緟缁勬墭鏉$爜
+            function GetMeesageByBarCode(obj) {
+                var HBarCode_Pack = $('#HBarCode_Pack').val()
+                var sOldBarCode = $('#HBarCode').val()
+                var HDeleteFlag = sOldBarCode.substring(0, 1);
+                var sBarCode = sOldBarCode.slice(1);
+
+                if (HBarCode_Pack == '') {
+                    playSound();
+                    layer.msg("鎵樻潯鐮佷笉鑳戒负绌猴紝璇峰厛鎵弿鎵樻潯鐮侊紒", {
+                        icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                    }, function () {
+                        $("#HBarCode_Pack").select();
+                        $("#HBarCode_Pack").focus();
+                    });
+                    return;
+                }
+
+                if (HDeleteFlag == "*") {
+                    if (sBarCode == "") {
+                        playSound();
+                        layer.msg("璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+                    else {
+                        $('#HBarCode').val("");
+                    }
+                    layer.load(3)
+                    $.ajax(
+                        {
+                            type: "GET",
+                            url: GetWEBURL() + "/WEBSController/set_DelPackUnionBill_Temp_Pack_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HBarCode": sBarCode, "HBillType": HBillType },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                    playSound_OK();
+                                    //鏄剧ず琛ㄤ綋鏄庣粏
+                                    DisBillEntryList();
+                                }
+                                else {
+                                    playSound();
+                                    layer.msg(data.Message, {
+                                        icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                    }, function () {
+                                        $("#HBarCode").select();
+                                        $("#HBarCode").focus();
+                                    });
+                                }
+                            },
+                            complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                            error: function (err) {
+                                playSound();
+                                layer.msg('閿欒' + err, {
+                                    icon: 2, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        });
+                    layer.closeAll("loading");
+                }
+                else {
+                    var sBarCode = $('#HBarCode').val()
+                    if (sBarCode == '') {
+                        playSound();
+                        layer.msg("鏉$爜涓嶈兘涓虹┖锛岃鎵弿鏉$爜锛�", {
+                            icon: 0, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                        }, function () {
+                            $("#HBarCode").select();
+                            $("#HBarCode").focus();
+                        });
+                        return;
+                    }
+
+                    layer.load(3)
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/WEBSController/Get_BarCode_PackUnionBill_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HBarCode": sBarCode, "HInterID": HInterID, "HBillType": HBillType, "HBillNo": HBillNo, "HBarCode_Pack": HBarCode_Pack, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                playSound_OK();
+                                if (sBarCode != "") {
+                                    $('#HBarCode').val("");
+                                }
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();     //鑾峰彇鍏夋爣
+                                element.tabChange('tab-Sc_PackUnionBill_PDA', '1');
+                                //鏄剧ず琛ㄤ綋鏄庣粏
+                                DisBillEntryList();
+                            }
+                            else {
+                                playSound();
+                                layer.msg(result.Message, {
+                                    icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                                }, function () {
+                                    $("#HBarCode").select();
+                                    $("#HBarCode").focus();
+                                });
+                            }
+                        },
+                        complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                        error: function (err) {
+                            playSound();
+                            layer.msg("閿欒锛�" + err, {
+                                icon: 5, time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", btn: ['纭']
+                            }, function () {
+                                $("#HBarCode").select();
+                                $("#HBarCode").focus();
+                            });
+                        }
+                    });
+                    layer.closeAll("loading");
+                }
+            }
+
+            //#endregion
+
+
+            //#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
+
+            function DisBillEntryList() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/WEBSController/GetBillEntry_Tmp_Pack_Json',
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HBillNo": HBillNo, "HBillType": HBillType },
+                    success: function (result) {
+                        var data = [];
+                        var col = [];
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in result.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": result.list[key].ColmCols, "name": result.list[key].ColmCols, "Type": result.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(result.list[key].ColmCols)) {
+                                    titleData[key] = result.list[key].ColmCols;
+                                }
+                            }
+
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'radio', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                            break;
+                                        default:
+
+                                        if (data[i].name == '鏁伴噺' || data[i].name == '鏉$爜涓暟') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', totalRow: true });
+                                        } else if (data[i].name == '鐗╂枡浠g爜') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 120 });
+                                        } else if (data[i].name == '鐗╂枡鍚嶇О' || data[i].name == '瑙勬牸鍨嬪彿') {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 180 });
+                                        } else {
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'left', width: 220 });
+                                        }
+                                    }
+                                }
+                            }
+                            columns = col;
+                            listOption.cols = [columns];
+                            listOption.data = result.data;
+                            listOption.totalRow = true;
+                            table.cache['wl-table'] = null;         //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+                            table.render(listOption);
+                        }
+                        else {
+                            listOption.cols = [[
+                                { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 100 }
+                                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 100 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+                                , { field: '鏉$爜涓暟', title: '鏉$爜涓暟', width: 100 }
+                            ]];
+                            listOption.data = data;
+                            table.render(listOption);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+
+            //#endregion
+
+
+
         });
 
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {
+            if (HInterID == 0) {
+                layer.msg("鍗曟嵁鍐呯爜鑾峰彇澶辫触锛岄敊璇殑鍗曟嵁鍐呯爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (HBillNo == '') {
+                layer.msg("鍗曟嵁鍙疯幏鍙栧け璐ワ紝閿欒鐨勫崟鎹彿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (sSubStr.length == 0) {
+                layer.msg("娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 'auto', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            return true;
+        }
     </script>
 
 </body>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 2dbae17..8eedf81 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -118,6 +118,18 @@
                                             </a>
                                         </li>
                                         <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html" target="main_self_frame">
+                                                <i class="layui-icon layui-icon-template-1"></i>
+                                                <cite style="white-space:pre-wrap">鐢熶骇缁勬墭鍗�</cite>
+                                            </a>
+                                        </li>
+                                        <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/鐢熶骇绠$悊/鍒犳墭鍗�/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame">
+                                                <i class="layui-icon layui-icon-app"></i>
+                                                <cite style="white-space:pre-wrap">鐢熶骇鎷嗘墭鍗�</cite>
+                                            </a>
+                                        </li>
+                                        <li class="layui-col-xs3">
                                             <a href="../杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-auz"></i>
                                                 <cite style="white-space:pre-wrap">鍑虹珯姹囨姤</cite>
@@ -439,6 +451,12 @@
                                             </a>
                                         </li>
                                         <li class="layui-col-xs3">
+                                            <a href="../WMS鎵爜妯″潡/鐢熶骇绠$悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBillList_PDA.html" target="main_self_frame">
+                                                <i class="layui-icon layui-icon-template-1"></i>
+                                                <cite style="white-space:pre-wrap">鐢熶骇缁勬墭鍗曠紦瀛�</cite>
+                                            </a>
+                                        </li>
+                                        <li class="layui-col-xs3">
                                             <a href="../WMS鎵爜妯″潡/瀹㈡埛鏉$爜鎵弿/Gy_getCusBarCodeBillList_PDA.html" target="main_self_frame">
                                                 <i class="layui-icon layui-icon-windows"></i>
                                                 <cite style="white-space:pre-wrap">瀹㈡埛鏉$爜鎵爜璁板綍鍗�</cite>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 0a92571..37987f8 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -769,7 +769,7 @@
                                 <dd>
                                     <a href="WMS鎵爜妯″潡/鐢熶骇绠$悊/鍒犳墭鍗�/Sc_DeletePackUnionBill_PDA.html" target="main_self_frame" style="color: aqua;">
                                         <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                                        鍒犳墭鍗�
+                                        鐢熶骇鎷嗘墭鍗�
                                     </a>
                                 </dd>
                                 <dd>
diff --git a/WebTM/views/index_QiaoYi.html b/WebTM/views/index_QiaoYi.html
index 67e9a62..f1fad27 100644
--- a/WebTM/views/index_QiaoYi.html
+++ b/WebTM/views/index_QiaoYi.html
@@ -243,8 +243,8 @@
     <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBillList.html">鍑哄簱鐢宠鍗曠淮鎶�</a></dd>
     <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_StockOutRequestBill.html">鍑哄簱鐢宠鍗�</a></dd>-->
                                         <dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">鐢熶骇棰嗘枡鍗�(闈炴煋鍘�)缁存姢</a></dd>
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_MateOutBillList.html?subType=缇婃瘺鏌撹壊">鐢熶骇棰嗘枡鍗�(缇婃瘺鏌撹壊)缁存姢</a></dd>
-                                        <dd><a lay-href="棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_MateOutBillList.html?subType=姣涘皷">鐢熶骇棰嗘枡鍗�(姣涘皷)缁存姢</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html?subType=缇婃瘺鏌撹壊">鐢熶骇棰嗘枡鍗�(缇婃瘺鏌撹壊)缁存姢</a></dd>
+                                        <dd><a lay-href="棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html?subType=姣涘皷">鐢熶骇棰嗘枡鍗�(姣涘皷)缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -285,6 +285,9 @@
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鎶ヨ〃/KF_ICinventoryQueryReport.html">鍙婃椂搴撳瓨鏌ヨ鎶ヨ〃</a></dd>
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICInventory_BarCode.html">鏉$爜搴撳瓨鏌ヨ鎶ヨ〃</a></dd>
                                         <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICInventory_Cus.html">瀹㈡埛鐗╂枡鍗虫椂搴撳瓨鎶ヨ〃</a></dd>
+                                        <dd><a lay-href="浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICInventory_Cus_Emp.html">瀹㈡埛鐗╂枡鍗虫椂搴撳瓨鎶ヨ〃_涓氬姟鍛�</a></dd>
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_CusShouGongChaoBaoSumReport.html">瀹㈡埛鎵嬪伐鎶勫寘姹囨�绘姤琛�</a></dd>
+                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_CusShouGongChaoBaoReport.html">瀹㈡埛鎵嬪伐鎶勫寘鏄庣粏鎶ヨ〃</a></dd>
                                         <!--<dd><a lay-href="浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_PonderationBillMain_Temp.html">鏉$爜鍑哄叆搴撶紦瀛樺垪琛�</a></dd>-->
                                         <!--<dd><a lay-href="浠撳瓨绠$悊/鏉$爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">鎵爜璁板綍缂撳瓨鎶ヨ〃</a></dd>-->
                                     </dl>
@@ -702,7 +705,6 @@
                                         <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_SeOrderBarCodeInAndOutStockDetailReport.html">閿�鍞鍗曟潯鐮佸嚭鍏ュ簱璇︽儏</a></dd>
                                         <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_OutDoorBillReport.html">鍑洪棬纭鍗曟姤琛�</a></dd>
                                         <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_SellOutCompareToProductReport.html">鍑哄簱鏉$爜鏄庣粏鎶ヨ〃</a></dd>
-                                        <dd><a lay-href="搴旀敹绠$悊/鎶ヨ〃鍒嗘瀽/Xs_CusShouGongChaoBaoReport.html">瀹㈡埛鎵嬪伐鎶勫寘鎶ヨ〃</a></dd>
                                     </dl>
                                 </dd>
                             </dl>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
index 619f2b2..c40357d 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
@@ -50,6 +50,7 @@
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                         </div>
                     </div>
@@ -79,6 +80,90 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�<!--<label style="color:red"> * </label>--></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEMPList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input 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" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
+                                                    <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
+                                                    <option value="1243">璋冩嫧鐢宠鍗�</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閫夊崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+                                                <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-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="display:none;">
+                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">涓荤<!--<label style="color:red"> * </label>--></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
@@ -88,8 +173,6 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">楠屾敹鍛�<!--<label style="color:red"> * </label>--></label>
                                             <div class="layui-input-inline">
@@ -111,51 +194,6 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">涓氬姟鍛�<!--<label style="color:red"> * </label>--></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEMPList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <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="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
-
-                                            </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="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璋冨叆浠撳簱<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red"> * </label></label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">椤圭洰浠g爜</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" value="" style="background-color: #efefef4d;float: left; width: 150px;" readonly>
@@ -165,39 +203,10 @@
                                                 </button>
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
-                                            <div class="layui-input-inline">
-                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
-                                                    <option value="1243" selected="selected">璋冩嫧鐢宠鍗�</option>
-                                                    <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">閫夊崟鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
-
-                                                <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 class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">椤圭洰鍚嶇О</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
@@ -230,20 +239,6 @@
                                     </div>
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
@@ -261,18 +256,32 @@
                                                 <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-block" style="margin-left: 120px;">
-                                                    <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
-                                                </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -314,6 +323,9 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>鎵归噺鍒犻櫎</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
@@ -365,13 +377,24 @@
             var allVal;
             //鍙屽嚮杩斿洖鍏ㄥ眬鍙橀噺
             window.OptionData = [];
+            //闇�瑕佹壒閲忓垹闄ょ殑鍒楄〃
+            var btnBatchDeleteList = [];
             //#endregion
 
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //#region 椤甸潰鍒濆鍖�
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+            //#endregion
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1207";
@@ -384,37 +407,83 @@
             //鑾峰彇婧愬崟绫诲瀷
             //HSourceBillType();
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
+
+            //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
             if (typeof (params[params[0]]) == "undefined") {
                 OperationType = 1;//鎿嶄綔绫诲瀷
-            } else {
+            }
+            else {
                 OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 linterid = params[params[1]];//婧愬崟id
             }
+            //#endregion
+
+            //#region 閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠″垵濮嬪寲
+            getCzyglByUser();
+
+            //#region 鏍规嵁璐﹀彿鑾峰彇閮ㄩ棬銆佽亴鍛樸�佷富绠�
+            function getCzyglByUser() {
+                $.ajax({
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "CurUserName": sessionStorage["HUserName"]
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+
+                            $("#HEmpID").val(data.HEmpID);
+                            $("#HEmpName").val(data.HEmpName);
+                            $("#HDeptID").val(data.HDeptID);
+                            $("#HDeptName").val(data.HDeptName);
+                            $("#HManagerID").val(data.HManagerID);
+                            $("#HManagerName").val(data.HManagerName);
 
 
-            //鍒ゆ柇鎿嶄綔绫诲瀷
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏄庣粏琛屽垵濮嬪寲
+            var rowdata = [{
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0","HPieceQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HSCSPID": 0, "璋冨嚭浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+            }];
+            // 鍒濆鍖栫晫
+            set_InitGrid();
+            DisPlay_HideColumn();
+            //#endregion
+
+            //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
-
+                $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
             }
             else if (OperationType == 3) {//缂栬緫
 
                 $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
+                $('#check-btn').removeClass("layui-btn-disabled").removeAttr("disabled");//鍙栨秷绂佺敤瀹℃牳鎸夐挳
             }
-
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-
-            //#endregion
-
-
-
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
@@ -433,488 +502,16 @@
                         $("#HInterID").val(d.data[0].HInterID);
                     }
                 });
-            } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 $("#HInterID").val(linterid);
                 RoadBillMain(linterid);
             }
             //#endregion
             //#endregion
 
-            var rowdata = [{
-                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
-                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-            }];
-            // 鍒濆鍖栫晫
-            set_InitGrid();
-            DisPlay_HideColumn();
-
-            //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                //鏂板琛岃〃鏍兼暟鎹�
-                var NewRow = {
-                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
-                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                };
-                switch (obj.event) {
-                    //搴撳瓨鏌ヨ
-                    case 'get_Inventory': get_Inventory();
-                        break;
-                    //鍑哄叆搴撹褰曟煡璇�
-                    case 'get_InOutSum': get_InOutSum();
-                        break;
-
-                    case 'btn-AddLine':
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-
-                        table.render(option);
-                        //鍒锋柊澶嶉�夋
-                        //checkRefresh();
-                        break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
-                        }
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn':
-                        get_HideColumn();
-                        break;
-
-                }
-            });
-
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
-
-
-
-            //閫夋嫨涓荤鎸夐挳
-            form.on('submit(HManagerList)', function () {
-                get_checkManager();
-            });
-            //閫夋嫨璋冨叆浠撳簱鎸夐挳
-            form.on('submit(HWHList)', function () {
-                get_checkWH();
-            });
-            //閫夋嫨璋冨嚭浠撳簱鎸夐挳
-            form.on('submit(HSCWHList)', function () {
-                get_checkSCWH();
-            });
-            //閫夋嫨楠屾敹鍛樻寜閽�
-            form.on('submit(HSecManagerList)', function () {
-                get_checkSecManager();
-            });
-            //閫夋嫨淇濈鍛樻寜閽�
-            form.on('submit(HKeeperList)', function () {
-                get_checkKeeper();
-            });
-            //閫夋嫨涓氬姟鍛樻寜閽�
-            form.on('submit(HEMPList)', function () {
-                get_checkHemp();
-            });
-            //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
-            form.on('submit(btnSearchHProNumber)', function () {
-                get_checkSearchHProNumber();
-            });
-            //#endregion
-
-
-
-            //淇濆瓨鎸夐挳
-            form.on('submit(set_SaveBill)', function (data) {
-                set_SaveBill(data);
-            });
-
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
-                var data = obj.data;
-                if (obj.event == 'HDate') {
-                    var field = $(this).data('field');
-                    laydate.render({
-                        elem: this.firstChild
-                        , show: true //鐩存帴鏄剧ず
-                        , closeStop: this
-                        , done: function (nowDate) {
-                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
-                            data[field] = nowDate;
-                            obj.update(data);
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
-                        }
-                    });
-                }
-            });
-
-
-            //#endregion
-
-
-            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
-            table.on('edit(mainTable)', function (obj) {
-                //鏁板�兼牸寮忔牎楠屽伐鍏�
-                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
-                var temp = "";
-
-                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
-                var oldText = $(this).prev().text();
-                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
-                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
-                    , field = obj.field; //寰楀埌瀛楁
-
-                switch (field) {
-                    case "HQty":                                         //鏁伴噺
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HQty: oldText
-                            });
-                            table.render(option);
-
-                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = value * 1;                           //鏁伴噺
-                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
-                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        /* table.render(option);*/
-                        break;
-                    case "HPrice":                                         //鍗曚环
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HPrice: oldText
-                            });
-                            /* table.render(option);*/
-
-                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
-                        var HPrice = value * 1;
-                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        break;
-                    case "HMoney":                                         //閲戦
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HMoney: oldText
-                            });
-                            /* table.render(option);*/
-
-                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
-                        var HMoney = value * 1;
-                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        break;
-                        table.render(option);
-                    default:
-                }
-            });
-            //#endregion
-            //#endregion
-            //#endregion
-
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-            //#region 搴撳瓨鏌ヨ
-            function get_Inventory() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
-                    var HMaterID = data[0].HMaterID.toString();
-                    //寮圭獥鏂规硶
-                    layer.open({
-                        type: 2//寮圭獥绫诲瀷
-                        , skin: 'layui-layer-rim' //鍔犱笂杈规
-                        , area: ['90%', '90%']//澶у皬
-                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
-                        , shift: 2//寮瑰嚭鍔ㄧ敾
-                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
-                        , btn: ['鍙栨秷']
-                        , btn1: function (index, layero) {
-                            layer.close(index);
-                        }
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
-                }
-            }
-            //#endregion
-            //#region 鍑哄叆搴撹褰曟煡璇�
-            function get_InOutSum() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
-                    var HMaterID = data[0].HMaterID.toString();
-                    layer.open({
-                        type: 2//寮圭獥绫诲瀷
-                        , skin: 'layui-layer-rim' //鍔犱笂杈规
-                        , area: ['90%', '90%']//澶у皬
-                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
-                        , shift: 2//寮瑰嚭鍔ㄧ敾
-                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
-                        , btn: ['鍙栨秷']
-                        , btn1: function (index, layero) {
-                            layer.close(index);
-                        }
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
-                }
-            }
-            //#endregion
-            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            function get_LoginIs() {
-                if (sessionStorage.login != "login") {
-                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                    }, function () { window.location.href = "../../user/login.html"; });
-                }
-            }
-            //#endregion
-
-
-            //鑾峰彇缁勭粐
-            function Organ() {
-                //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var Organization = '';
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/Web/GetOrganizations",
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data;
-                            for (var i = 0; i < data.length; i++) {
-                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
-                            }
-                            $("#HUSEORGID").append(Organization);
-                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
-                    }
-                })
-            }
-
-            //鏃ユ湡鏍煎紡鍖�
-            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 set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , limit: 500
-                    , height: 500
-                    , loading: false
-                    , totalRow: true
-                    , cols: [[ //瀛愯〃
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                        , { type: 'numbers', title: '搴忓彿', width: 100 }
-                        , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
-                        , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
-                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
-                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
-                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true }
-                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150, edit: 'text', event: "HPropertyID" }//f7
-                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text' }
-
-
-                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
-                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
-                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
-                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
-                        , { field: 'HOutPrice', title: '璋冨嚭鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HOutMoney', title: '璋冨嚭閲戦', width: 100, edit: 'text', totalRow: true }
-                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
-                        , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
-                        , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true }
-                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 150, edit: 'text', event: "HSCWHID" }//f7
-                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
-                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true }
-                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
-                        , { field: 'HBatchNo', title: '鎵规', width: 150, edit: 'text', hide: true }
-                        , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟涓诲唴鐮�
-                        , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟瀛愬唴鐮�
-                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 150, edit: 'text', event: "HPOOrderBillNo" }//閲囪喘璁㈠崟鍙�
-                        , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 100, hide: true }//閿�鍞鍗曚富鍐呯爜
-                        , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true }//閿�鍞鍗曞瓙鍐呯爜
-                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 150, edit: 'text', event: "HSeOrderBillNo" }//閿�鍞鍗曞彿
-                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-
-                    ]]
-                }
-
-                option.data = [];
-                table.render(option);
-            }
-
-            //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid) {
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + "Kf_MoveStockBill/Kf_MoveStockBillEdit",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data[0];
-                            data1 = result.data[1];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-
-                                "HInterID": data[0]["hmainid"]
-                                , "HBillNo": data[0]["鍗曟嵁鍙�"]
-                                , "HDate": formatDate(data[0]["鏃ユ湡"])
-                                , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
-
-                                , "HEmpID": data[0]["HEmpID"]
-                                , "HEmpName": data[0]["涓氬姟鍛�"]
-                                , "HSecManagerID": data[0]["HSecManagerID"]
-                                , "HSecManagerName": data[0]["楠屾敹鍛�"]
-                                , "HKeeperID": data[0]["HKeeperID"]
-                                , "HKeeperName": data[0]["淇濈鍛�"]
-                                , "HManagerID": data[0]["HManagerID"]
-                                , "HMangerName": data[0]["涓荤"]
-
-                                , "HWHID": data[0]["HWHID"]
-                                , "HWHName": data[0]["璋冨叆浠撳簱"]
-                                , "HSCWHID": data[0]["HSCWHID"]
-                                , "HSCWHName": data[0]["璋冨嚭浠撳簱"]
-                               
-                                
-                                , "HExplanation": data[0]["HExplanation"]
-                                , "HInvoiceBillNo": data[0]["鍙戠エ缂栧彿"]
-                                , "HProjectID": data[0]["HProjectID"]
-                                , "HProNumber": data[0]["椤圭洰缂栫爜"]
-                                , "HProName": data[0]["椤圭洰鍚嶇О"]
-
-                                , "HRemark": data[0]["琛ㄥご澶囨敞"]
-                                , "HMaker": data[0]["鍒跺崟浜�"]
-                                , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HUpDater": data[0]["淇敼浜�"]
-                                , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HChecker": data[0]["瀹℃牳浜�"]
-                                , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HCloseMan": data[0]["鍏抽棴浜�"]
-                                , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HDeleteMan": data[0]["浣滃簾浜�"]
-                                , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
-
-                            });
-
-
-                            option.data = data1;
-                            table.render(option);
-                            form.render('select');
-
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            //#endregion
-
-            //閫�鍑�
+            //#region 鑿滃崟鏍忔搷浣滄寜閽�
+            //#region 閫�鍑烘寜閽�
             form.on('submit(Exit)', function (data) {
                 if (linterid == undefined) {
                     //鍏抽棴椤电
@@ -925,20 +522,60 @@
                     Pub_Close(1);
                 }
             });
+            //#endregion
 
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(1);
+            });
 
+            //#region 瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
+            function set_CheckBill(num) {
+                var HInterID = $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + '/Kf_MoveStockBill/CheckKf_MoveStockBill',
+                    type: "GET",
+                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                            });
+                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+
+            //#region 淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
 
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^\d+$/;                 //姝f暣鏁版鍒欒〃杈惧紡
+                var temp = "";
 
-                if ($("#HWHID").val() == 0) {
-                    layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSCWHID").val() == 0) {
-                    layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if ($("#HWHID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HSCWHID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 //if ($("#HManagerID").val() == 0) {
                 //    layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return;
@@ -955,7 +592,57 @@
                 //    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 //    return;
                 //}
-                
+
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨寰�鏉ュ崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                if (option.data.length == 0) {
+                    layer.msg("瀛愯〃鏈缃暟鎹紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨璋冨叆浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+
+                    if (option.data[i]["HSCWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨璋冨嚭浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+
+                    if (option.data[i]["HWHID"] == option.data[i]["HSCWHID"]) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璋冨叆浠撳簱涓庤皟鍑轰粨搴撲笉鑳界浉鍚岋紝璇锋鏌ワ紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+
+                    //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炴敹鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炴敹鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+
+                    //浠舵暟鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPieceQty"] + "";
+                    if (!ref1.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                }
 
 
                 var num = [];
@@ -1017,6 +704,11 @@
                             layer.msg(data.Message, { icon: 1 });
 
                             $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+
+                            setTimeout(function () {
+                                $('#check-btn').removeClass("layui-btn-disabled").removeAttr("disabled");//鍙栨秷绂佺敤瀹℃牳鎸夐挳 
+                            }, 3000);
+
                             //淇濆瓨鍚庢祻瑙�
                             //ReRoadBillMain();
                         }
@@ -1032,12 +724,49 @@
                 });
             }
             //#endregion
+            //#endregion
+            //#endregion
 
-            ////#endregion
+            //#region 琛ㄥご鍩虹璧勬枡閫夋嫨
+            //#region 閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
 
-            //#region  璋冨叆浠撳簱 璋冨嚭浠撳簱 閮ㄩ棬 淇濈鍛� 涓荤 楠屾敹鍛�
+            //#region 涓荤閫夋嫨椤甸潰
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓荤鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+                        }
 
-            //璋冨叆浠撳簱
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨璋冨叆浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+
+            //#region 璋冨叆浠撳簱閫夋嫨椤甸潰
             function get_checkWH() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1070,7 +799,15 @@
                     , btn2: function (index, layero) { }
                 })
             }
-            //璋冨嚭浠撳簱
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨璋冨嚭浠撳簱鎸夐挳
+            form.on('submit(HSCWHList)', function () {
+                get_checkSCWH();
+            });
+
+            //#region 璋冨嚭浠撳簱閫夋嫨椤甸潰
             function get_checkSCWH() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1103,7 +840,15 @@
                     , btn2: function (index, layero) { }
                 })
             }
-            //楠屾敹鍛�
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+
+            //#region 楠屾敹鍛橀�夋嫨椤甸潰
             function get_checkSecManager() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1126,7 +871,46 @@
                     , btn2: function (index, layero) { }
                 })
             }
-            //淇濈鍛�
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //#region 閮ㄩ棬閫夋嫨椤甸潰
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+
+            //#region 淇濈鍛橀�夋嫨椤甸潰
             function get_checkKeeper() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1149,7 +933,15 @@
                     , btn2: function (index, layero) { }
                 })
             }
-            //涓氬姟鍛�
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEMPList)', function () {
+                get_checkHemp();
+            });
+
+            //#region 涓氬姟鍛橀�夋嫨椤甸潰
             function get_checkHemp() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1169,20 +961,31 @@
                         $("#HEmpID").val(checkStatus.data[0].HItemID);
                         $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
 
+                        getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
+
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
                 })
             }
-            //涓荤
-            function get_checkManager() {
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(HSupList)', function () {
+                get_checkCus();
+            });
+
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkCus() {
+                var HEmpID = $("#HEmpID").val();
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '涓荤鍒楄〃'//鏍囬
+                    , title: '涓氬姟瀹㈡埛鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp=' + HEmpID, 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1191,14 +994,21 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
 
-                        $("#HManagerID").val(checkStatus.data[0].HItemID);
-                        $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        $("#HSupName").val(checkStatus.data[0].HName);
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
                 })
             }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨椤圭洰浠g爜鎸夐挳
+            form.on('submit(btnSearchHProNumber)', function () {
+                get_checkSearchHProNumber();
+            });
 
             //#region 椤圭洰浠g爜閫夋嫨椤甸潰
             function get_checkSearchHProNumber() {
@@ -1238,542 +1048,20 @@
                 })
             }
             //#endregion
-
             //#endregion
 
-            //琛屽唴蹇嵎閿瓫閫�
-            function set_GridCellCheck(obj) {
-                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
-                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
-                    if (event.key != "F7") {
-                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
-                        if (obj.event == "HMaterID") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
-                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
-                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
-                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
-                                    var innerHeight = window.innerHeight;
-                                    var top = offset.top + 0.05 * innerHeight;
-                                    var left = offset.left;
-                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
-                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
-                                    }
-                                    layer.open({
-                                        type: 2                                                                                     //寮圭獥绫诲瀷
-                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
-                                        , area: ['25%', '30%']                                                                      //澶у皬
-                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
-                                        , offset: [top, left]
-                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
-                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
-                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
-                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
-                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
-                                        , success: function (layero, index) {
-                                            setTimeout(function () {
-                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
-                                                currRowIndex = 0;
-                                                var tableView = "h_v_Gy_MaterialList";
-                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
-                                                childPage.getData(childSWhere, tableView);
-                                            }, 200);
-                                        }
-                                        , end: function () {
-                                            obj.event = "";
-                                            childPage = null;
-                                            currRowIndex = 0;
-                                            if (childData != null) {
-                                                obj.update({
-                                                    "HMaterID": childData.HItemID
-                                                    , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
-                                                    , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
-                                                    , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
-                                                    , "HUnitID": childData.HUnitID
-                                                    , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
-                                                })
-
-                                                childData = null;
-                                            }
-                                        }
-                                    });
-                                } else {
-                                    setTimeout(function () {
-                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
-                                        currRowIndex = 0;
-                                        var tableView = "h_v_Gy_MaterialList";
-                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
-                                        childPage.getData(childSWhere, tableView);
-                                    }, 200);
-                                }
-                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
-                                if (event.key == "ArrowUp") {
-                                    currRowIndex--;
-                                    childPage.setSelectedRow(currRowIndex);
-                                } else if (event.key == "ArrowDown") {
-                                    currRowIndex++;
-                                    childPage.setSelectedRow(currRowIndex);
-                                } else if (event.key == "Enter") {
-                                    //鎵嬪姩澶辩劍
-                                    var element = document.getElementById("HBillNo");
-                                    element.focus();
-
-                                    childPage.getSelectedData(currRowIndex);
-
-                                    if (childData != null) {
-                                        obj.update({
-                                            "HMaterID": childData.HItemID
-                                            , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
-                                            , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
-                                            , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
-                                            , "HUnitID": childData.HUnitID
-                                            , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
-                                        })
-
-                                        childData = null;
-                                    }
-                                    
-
-                                    childPage = null;
-                                    currRowIndex = 0;
-                                    childData = null;
-                                    obj.event = "";
-                                }
-                            }
-                        }
-
-                    }
-                    //#endregion
-
-                    if (event.key == "F7") {
-                        //鐗╂枡
-                        if (obj.event == "HMaterID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "鐗╂枡鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length <1) {
-                                        return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
-                                    if (checkStatus.data.length > 1) {
-                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
-                                        for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
-                                            if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
-                                                var NewRow = {
-                                                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                                                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
-                                                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                                                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                                };
-                                                table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
-                                                option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
-                                                table.render(option);//娓叉煋鐣岄潰
-                                            }
-                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID; 
-                                            option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
-                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О; 
-                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿; 
-                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; 
-                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О; 
-                                        }
-                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
-                                    }
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                    if (OptionData != null && OptionData.length == undefined) {
-                                        obj.update({
-                                            "HMaterID": OptionData.HItemID
-                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                            , "HUnitID": OptionData.HUnitID
-                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                        })
-                                        OptionData = [];
-                                    }
-                                }
-                            });
-                        }
-                        //杈呭姪灞炴��
-                        if (obj.event == "HPropertyID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "杈呭姪灞炴�у垪琛�"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HPropertyID": checkStatus.data[0].HItemID,
-                                        "杈呭姪灞炴��": checkStatus.data[0].杈呭姪灞炴�у悕绉�
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                    if (OptionData != null && OptionData.length == undefined) {
-                                        obj.update({
-                                            "HPropertyID": OptionData.HItemID
-                                            , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
-                                        })
-                                        OptionData = [];
-                                    }
-                                }
-                            })
-                        }
-                        //璁¢噺鍗曚綅
-                        if (obj.event == "HUnitID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-
-
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-
-                                        "HUnitID": checkStatus.data[0].HItemID,
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                    if (OptionData.length > 0) {
-                                        obj.update({
-                                            "HUnitID": OptionData[0].HItemID
-                                            , "璁¢噺鍗曚綅": OptionData[0].璁¢噺鍗曚綅鍚嶇О
-                                        })
-                                        OptionData = [];
-                                    }
-                                
-                            }
-                            })
-                        }
-                        //璋冨叆浠撳簱
-                        if (obj.event == "HWHID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "璋冨叆浠撳簱鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-
-                                        "HWHID": checkStatus.data[0].HItemID,
-                                        "璋冨叆浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                    if (OptionData != null && OptionData.length == undefined) {
-                                        obj.update({
-                                            "HWHID": OptionData.HItemID
-                                            , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
-                                        })
-                                        OptionData = [];
-                                    }
-                                }
-                            })
-                            
-                        }
-                        //璋冨嚭浠撳簱
-                        if (obj.event == "HSCWHID") {
-                                layer.open({
-                                    type: 2
-                                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                                    , title: "璋冨嚭浠撳簱鍒楄〃"  //鏍囬
-                                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                    , area: ["90%", "90%"] //绐椾綋澶у皬
-                                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
-                                    , btn: ["纭畾", "鍙栨秷"]
-                                    , btn1: function (index, laero) {
-                                        //鎸夐挳涓�  鐨勫洖璋�
-                                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                        if (checkStatus.data.length != 1) {
-                                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                        }
-                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                        obj.update({
-
-                                            "HSCWHID": checkStatus.data[0].HItemID,
-                                            "璋冨嚭浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
-                                        })
-                                        layer.close(index);//鍏抽棴寮圭獥
-                                    }
-                                    , end: function () {
-                                        if (OptionData != null && OptionData.length == undefined) {
-                                            obj.update({
-                                                "HSCWHID": OptionData.HItemID
-                                                , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
-                                            })
-                                            OptionData = [];
-                                        }
-                                    }
-                                })
-                            }
-                        //浠撲綅
-                        if (obj.event == "HSPID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                       
-                                        "HSPID": checkStatus.data[0].HMainID,
-                                         "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                    if (OptionData != null && OptionData.length == undefined) {
-                                        obj.update({
-                                            "HSPID": OptionData.HMainID
-                                            , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
-                                        })
-                                        optiondata = [];
-                                    }
-                                }
-                            })
-                        }
-                       
-                        //閲囪喘璁㈠崟鍙�
-                        if (obj.event == "HPOOrderBillNo") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "閲囪喘璁㈠崟鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HPOOrderInterID": checkStatus.data[0].hmainid,
-                                        "HPOOrderEntryID": checkStatus.data[0].hsubid,
-                                        "HPOOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                            })
-                        }
-                        //閿�鍞鍗曞彿
-                        if (obj.event == "HSeOrderBillNo") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "閿�鍞鍗曞垪琛�"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-
-                                        "HSeOrderInterID": checkStatus.data[0].hmainid,
-                                        "HSeOrderEntryID": checkStatus.data[0].hsubid,
-                                        "HSeOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                            })
-                        }
-                        obj.event = "";
-                        return false;
-                    }
-                })
-
-                $(document).off('dblclick', ".layui-table-edit").on('dblclick', '.layui-table-edit', function (e) {
-                    //鎵嬪姩澶辩劍
-                    var element = document.getElementById("HBillNo");
-                    element.focus();
-
-                    //鐗╂枡
-                    if (obj.event == "HMaterID") {
-                        layer.open({
-                            type: 2
-                            , skin: "layui-layer-rim" //鍔犱笂杈规
-                            , title: "鐗╂枡鍒楄〃"  //鏍囬
-                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                            , shift: 2 //寮瑰嚭鍔ㄧ敾
-                            , area: ["90%", "90%"] //绐椾綋澶у皬
-                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
-                            , btn: ["纭畾", "鍙栨秷"]
-                            , btn1: function (index, laero) {
-                                //鎸夐挳涓�  鐨勫洖璋�
-                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                if (checkStatus.data.length < 1) {
-                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                }
-                                OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
-                                if (checkStatus.data.length > 1) {
-                                    var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
-                                    for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
-                                        if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
-                                            var NewRow = {
-                                                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                                                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
-                                                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                                            };
-                                            table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
-                                            option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
-                                            table.render(option);//娓叉煋鐣岄潰
-                                        }
-                                        option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
-                                        option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
-                                        option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
-                                        option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
-                                        option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
-                                        option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
-                                    }
-                                    table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
-                                }
-                                layer.close(index);//鍏抽棴寮圭獥
-                            }
-                            , end: function () {
-                                if (OptionData != null && OptionData.length == undefined) {
-                                    obj.update({
-                                        "HMaterID": OptionData.HItemID
-                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
-                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
-                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
-                                        , "HUnitID": OptionData.HUnitID
-                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    OptionData = [];
-                                }
-                            }
-                        });
-                    }
-                    obj.event = "";
-                    //return false;
-                })
-            }
-
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
-            });
-
-            //#region 鍔ㄦ�佸脊鍑洪〉闈�
-            function getSupType() {
-                var type = $("#HSourceBillType").val();
-                switch (type) {
-                    case '1243':
-                        return { url: "../../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html", name: "璋冩嫧鐢宠鍗�" };
-                        break;
-                }
-            }
-           //#endregion
-
-            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
             form.on('submit(XDHList)', function () {
                 if ($("#HSourceBillType").val() == "1243") {
                     var url = getSupType().url;
                     url = encodeURI(url);
 
-                } else
-                {
+                } else {
                     if ($("#HSourceBillType").val() != 0 && $("#HSourceBillType").val() !== null) {
                         return layer.msg('浣犻�夋嫨鐨勬簮鍗曚笉瀛樺湪');
                     }
                 }
-               
+
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2
@@ -1845,7 +1133,7 @@
                                     "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
                                     "HPropertyID": checkStatus.data[j].HPropertyID, "杈呭姪灞炴��": checkStatus.data[j].杈呭姪灞炴��, "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": checkStatus.data[j].搴旀敹鏁伴噺, "HQty": checkStatus.data[j].瀹炴敹鏁伴噺, "HRemark": checkStatus.data[j].琛ㄤ綋澶囨敞,
                                     "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "璋冨叆浠撳簱": checkStatus.data[j].璋冨叆浠撳簱, "HSCWHID": checkStatus.data[j].HSCWHID, "璋冨嚭浠撳簱": checkStatus.data[j].璋冨嚭浠撳簱,
-                                    "HSPID":"0", "浠撲綅鍚嶇О":"",
+                                    "HSPID": "0", "浠撲綅鍚嶇О": "", "HSCSPID": "0", "璋冨嚭浠撲綅鍚嶇О": "",
                                     "HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].閲囪喘璁㈠崟鍙�,
                                     "HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].閿�鍞鍗曞彿,
                                     "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
@@ -1855,52 +1143,216 @@
                             table.render(option);
                             layer.close(index);//鍏抽棴寮圭獥
                         }
-                        
+
                     }
-                       
+
                 });
             });
 
-            //鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
-            function checkDuplicateData(data) {
-                const duplicates = [];
-
-                for (let i = 0; i < data.length; i++) {
-                    const currentItem = data[i];
-                    let isDuplicate = false;
-
-                    for (let j = i + 1; j < data.length; j++) {
-                        const compareItem = data[j];
-
-                        if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
-                            isDuplicate = true;
-                            duplicates.push({ row1: i + 1, row2: j + 1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁�
-                        }
-                    }
-                    if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
-                        duplicates.push({ row1: i + 1, row2: -1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁帮紝-1 琛ㄧず鏈壘鍒颁笌褰撳墠琛岄噸澶嶇殑琛�
-                    }
+            //#region 鍔ㄦ�佸脊鍑洪〉闈�
+            function getSupType() {
+                var type = $("#HSourceBillType").val();
+                switch (type) {
+                    case '1243':
+                        return { url: "../../浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html", name: "璋冩嫧鐢宠鍗�" };
+                        break;
                 }
-                return duplicates;
             }
-            //琛屽唴鍒犻櫎
-            function set_GridDelete(obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+            //#endregion
+
+            //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曡皟鎷ㄧ敵璇峰崟鏁版嵁
+            function getPushSource_MoveStockRequestInBillInit(HSourceInterID, HSourceEntryID) {
+                var res = "none";
+                $.ajax({
+                    url: GetWEBURL() + "/Kf_MoveStockBill/loadKf_MoveStockBillMain_Push",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HInterID": HSourceInterID
+                        , "HSubID": HSourceEntryID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            res = result.data[0];
                         } else {
-                            obj.del();
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
-                            layer.close(index);
+                            res = result.data;
+                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         }
-                    });
+                    }, error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄦ牸鐩戝惉浜嬩欢
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0","HPieceQty":"0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HSCSPID": 0, "璋冨嚭浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                };
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                        break;
+                    //澶嶅埗
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                        break;
+                    //涓婄Щ
+                    case 'btn-Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn-Under': btn_under();
+                        break;
+                    //鎵归噺鍒犻櫎
+                    case 'btn-batchDelete': btn_batchDelete();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+                }
+            });
+
+            //#region 涓婄Щ
+            function btn_up() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == 0) {
+                                layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+                                return;
+                            }
+                            tables.push(option.data[i - 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i - 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
                 }
             }
+            //#endregion
+
+            //#region 涓嬬Щ
+            function btn_under() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == option.data.length - 1) {
+                                layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+                                return;
+                            }
+
+
+                            tables.push(option.data[i + 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i + 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 鎵归噺鍒犻櫎
+            function btn_batchDelete() {
+                var data = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    if ($.inArray(i + "", btnBatchDeleteList) == -1) {
+                        data.push(option.data[i]);
+                    }
+                }
+                option.data = data;
+                table.render(option);
+
+                btnBatchDeleteList = [];
+            }
+
+            //#region 鐩戝惉澶嶉�夋閫変腑浜嬩欢
+            table.on('checkbox(mainTable)', function (obj) {
+                //鑾峰彇閫変腑琛岀殑绱㈠紩鍒楄〃
+                var rowIndex = $(obj.tr).attr("data-index");
+
+                if (typeof (rowIndex) == "undefined") {
+                    if (btnBatchDeleteList.length == option.data.length) {
+                        btnBatchDeleteList = [];
+                    } else {
+                        btnBatchDeleteList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            btnBatchDeleteList.push(i + "");
+                        }
+                    }
+                } else {
+                    if ($.inArray(rowIndex, btnBatchDeleteList) > -1) {
+                        var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                        btnBatchDeleteList = btnBatchDeleteList_New;
+                    } else {
+                        btnBatchDeleteList.push(rowIndex);
+                    }
+                }
+                console.log(btnBatchDeleteList);
+            });
+            //#endregion
+            //#endregion
 
             //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
             function get_HideColumn() {
@@ -2038,11 +1490,911 @@
             }
             //#endregion
 
-            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-            function ReRoadBillMain() {
-                location.replace('Add_Edit_Kf_POStockInBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
-                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+            //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            option.data = oldData;
+                            table.render(option);
+
+                            //鏇存柊鎵归噺鍒犻櫎绱㈠紩鍒楄〃
+                            var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                            btnBatchDeleteList = btnBatchDeleteList_New;
+                            for (var i = 0; i < btnBatchDeleteList.length; i++) {
+                                if (btnBatchDeleteList[i] * 1 > rowIndex * 1) {
+                                    btnBatchDeleteList[i] = (btnBatchDeleteList[i] * 1 - 1) + "";
+                                }
+                            }
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 琛屽唴蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                    if (event.key != "F7") {
+                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                        if (obj.event == "HMaterID") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_MaterialList";
+                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                                childPage.getData(childSWhere, tableView);
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            if (childData != null) {
+                                                obj.update({
+                                                    "HMaterID": childData.HItemID
+                                                    , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
+                                                    , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
+                                                    , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
+                                                    , "HUnitID": childData.HUnitID
+                                                    , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
+                                                })
+
+                                                childData = null;
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_MaterialList";
+                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+                                    if (childData != null) {
+                                        obj.update({
+                                            "HMaterID": childData.HItemID
+                                            , "鐗╂枡浠g爜": childData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": childData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": childData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": childData.HUnitID
+                                            , "璁¢噺鍗曚綅": childData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+
+                                        childData = null;
+                                    }
+
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+
+                    }
+                    //#endregion
+
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length < 1) {
+                                        return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                    if (checkStatus.data.length > 1) {
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                        for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                            if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                                var NewRow = {
+                                                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                                                    "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                                                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HSCSPID": 0, "璋冨嚭浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                                };
+                                                table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                                option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+                                                table.render(option);//娓叉煋鐣岄潰
+                                            }
+                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
+                                            option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
+                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+                                        }
+                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                    }
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HMaterID": OptionData.HItemID
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
+                            });
+                        }
+                        //杈呭姪灞炴��
+                        if (obj.event == "HPropertyID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "杈呭姪灞炴�у垪琛�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HPropertyID": checkStatus.data[0].HItemID,
+                                        "杈呭姪灞炴��": checkStatus.data[0].杈呭姪灞炴�у悕绉�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HPropertyID": OptionData.HItemID
+                                            , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
+                            })
+                        }
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HUnitID": checkStatus.data[0].HItemID,
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData.length > 0) {
+                                        obj.update({
+                                            "HUnitID": OptionData[0].HItemID
+                                            , "璁¢噺鍗曚綅": OptionData[0].璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+                                }
+                            })
+                        }
+                        //璋冨叆浠撳簱
+                        if (obj.event == "HWHID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璋冨叆浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HWHID": checkStatus.data[0].HItemID,
+                                        "璋冨叆浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HWHID": OptionData.HItemID
+                                            , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
+                            })
+
+                        }
+                        //璋冨嚭浠撳簱
+                        if (obj.event == "HSCWHID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璋冨嚭浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSCWHID": checkStatus.data[0].HItemID,
+                                        "璋冨嚭浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSCWHID": OptionData.HItemID
+                                            , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+                                }
+                            })
+                        }
+                        //浠撲綅
+                        if (obj.event == "HSPID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSPID": checkStatus.data[0].HMainID,
+                                        "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSPID": OptionData.HMainID
+                                            , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                        })
+                                        optiondata = [];
+                                    }
+                                }
+                            })
+                        }
+                        //璋冨嚭浠撲綅
+                        if (obj.event == "HSCSPID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSCSPID": checkStatus.data[0].HMainID,
+                                        "璋冨嚭浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (OptionData != null && OptionData.length == undefined) {
+                                        obj.update({
+                                            "HSCSPID": OptionData.HMainID
+                                            , "璋冨嚭浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                        })
+                                        optiondata = [];
+                                    }
+                                }
+                            })
+                        }
+                        //閲囪喘璁㈠崟鍙�
+                        if (obj.event == "HPOOrderBillNo") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閲囪喘璁㈠崟鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HPOOrderInterID": checkStatus.data[0].hmainid,
+                                        "HPOOrderEntryID": checkStatus.data[0].hsubid,
+                                        "HPOOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //閿�鍞鍗曞彿
+                        if (obj.event == "HSeOrderBillNo") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閿�鍞鍗曞垪琛�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSeOrderInterID": checkStatus.data[0].hmainid,
+                                        "HSeOrderEntryID": checkStatus.data[0].hsubid,
+                                        "HSeOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+
+                $(document).off('dblclick', ".layui-table-edit").on('dblclick', '.layui-table-edit', function (e) {
+                    //鎵嬪姩澶辩劍
+                    var element = document.getElementById("HBillNo");
+                    element.focus();
+
+                    //鐗╂枡
+                    if (obj.event == "HMaterID") {
+                        layer.open({
+                            type: 2
+                            , skin: "layui-layer-rim" //鍔犱笂杈规
+                            , title: "鐗╂枡鍒楄〃"  //鏍囬
+                            , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                            , shift: 2 //寮瑰嚭鍔ㄧ敾
+                            , area: ["90%", "90%"] //绐椾綋澶у皬
+                            , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                            , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                            , btn: ["纭畾", "鍙栨秷"]
+                            , btn1: function (index, laero) {
+                                //鎸夐挳涓�  鐨勫洖璋�
+                                var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                if (checkStatus.data.length < 1) {
+                                    return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                }
+                                OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                if (checkStatus.data.length > 1) {
+                                    var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")鐢ㄤ簬鑾峰彇璇r鍏冪礌涓奷ata-index灞炴�х殑鍊�*1杞崲绫诲瀷鐒跺悗璧嬪�肩粰rowIndex
+                                    for (var i = 0; i < checkStatus.data.length; i++) {  //鍒ゆ柇閫変腑鐨勬暟鎹殑闀垮害  鐢ㄤ簬閬嶅巻checkStatus.data鏁扮粍涓殑姣忎釜鍏冪礌
+                                        if (rowIndex + i >= option.data.length) {           //鍒ゆ柇rowIndex + i鐨勭储寮曡秴鍑轰簡option.data鏁扮粍鐨勯暱搴︼紝璇存槑option.data鏁扮粍闇�瑕佹墿灞曚互鍖呭惈鏇村琛�
+                                            var NewRow = {
+                                                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "1", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                                                "HOutPrice": "0", "HOutMoney": "0", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "璋冨叆浠撳簱": "", "HSCWHID": 0, "璋冨嚭浠撳簱": "",
+                                                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HSCSPID": 0, "璋冨嚭浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                                            };
+                                            table.cache["mainTable"].push(NewRow);    //鍒涘缓鏂扮殑鍖呭惈鏁扮粍  浼犲叆table.cache["mainTable"]鏁扮粍
+                                            option.data = table.cache["mainTable"];  //鎶婁紶鍏� table.cache["mainTable"]鏁扮粍鐨勫�艰祴鍊肩粰option.data 鐨勫睘鎬�
+                                            table.render(option);//娓叉煋鐣岄潰
+                                        }
+                                        option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;
+                                        option.data[rowIndex + i].鐗╂枡浠g爜 = checkStatus.data[i].鐗╂枡浠g爜;
+                                        option.data[rowIndex + i].鐗╂枡鍚嶇О = checkStatus.data[i].鐗╂枡鍚嶇О;
+                                        option.data[rowIndex + i].瑙勬牸鍨嬪彿 = checkStatus.data[i].瑙勬牸鍨嬪彿;
+                                        option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+                                        option.data[rowIndex + i].璁¢噺鍗曚綅 = checkStatus.data[i].璁¢噺鍗曚綅鍚嶇О;
+                                    }
+                                    table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                }
+                                layer.close(index);//鍏抽棴寮圭獥
+                            }
+                            , end: function () {
+                                if (OptionData != null && OptionData.length == undefined) {
+                                    obj.update({
+                                        "HMaterID": OptionData.HItemID
+                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                        , "HUnitID": OptionData.HUnitID
+                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                    OptionData = [];
+                                }
+                            }
+                        });
+                    }
+                    obj.event = "";
+                    //return false;
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                switch (field) {
+                    case "HQty":                                         //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        /* table.render(option);*/
+                        break;
+                    case "HPrice":                                         //鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HPrice: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = value * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                    case "HMoney":                                         //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;
+                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                        table.render(option);
+                    default:
+                }
+            });
+            //#endregion
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏃ユ湡鏍煎紡鍖�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+            //#endregion
+
+            //#region 瀛愯〃鍒濆鍖�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , totalRow: true
+                    , cols: [[ //瀛愯〃
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
+                        , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true }
+                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150, edit: 'text', event: "HPropertyID" }//f7
+                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text' }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, totalRow: true }
+                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HPieceQty', title: '浠舵暟', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
+                        , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HOutPrice', title: '璋冨嚭鍗曚环', width: 100, edit: 'text' }
+                        , { field: 'HOutMoney', title: '璋冨嚭閲戦', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+                        , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
+                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true }
+                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
+                        , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true }
+                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 150, edit: 'text', event: "HSCWHID" }//f7
+                        , { field: 'HSCSPID', title: 'HSCSPID', width: 100, hide: true }
+                        , { field: '璋冨嚭浠撲綅鍚嶇О', title: '璋冨嚭浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSCSPID" }//f7
+                        , { field: 'HBatchNo', title: '鎵规', width: 150, edit: 'text', hide: true }
+                        , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟涓诲唴鐮�
+                        , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟瀛愬唴鐮�
+                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 150, edit: 'text', event: "HPOOrderBillNo" }//閲囪喘璁㈠崟鍙�
+                        , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 100, hide: true }//閿�鍞鍗曚富鍐呯爜
+                        , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true }//閿�鍞鍗曞瓙鍐呯爜
+                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 150, edit: 'text', event: "HSeOrderBillNo" }//閿�鍞鍗曞彿
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+
+                    ]]
+                }
+
+                option.data = [];
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Kf_MoveStockBill/Kf_MoveStockBillEdit",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            data1 = result.data[1];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+
+                                "HInterID": data[0]["hmainid"]
+                                , "HBillNo": data[0]["鍗曟嵁鍙�"]
+                                , "HDate": formatDate(data[0]["鏃ユ湡"])
+                                , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
+                                , "HSupID": data[0]["HSupID"]
+                                , "HSupName": data[0]["寰�鏉ュ崟浣�"]
+                                , "HEmpID": data[0]["HEmpID"]
+                                , "HEmpName": data[0]["涓氬姟鍛�"]
+                                , "HSecManagerID": data[0]["HSecManagerID"]
+                                , "HSecManagerName": data[0]["楠屾敹鍛�"]
+                                , "HKeeperID": data[0]["HKeeperID"]
+                                , "HKeeperName": data[0]["淇濈鍛�"]
+                                , "HManagerID": data[0]["HManagerID"]
+                                , "HMangerName": data[0]["涓荤"]
+
+                                , "HWHID": data[0]["HWHID"]
+                                , "HWHName": data[0]["璋冨叆浠撳簱"]
+                                , "HSCWHID": data[0]["HSCWHID"]
+                                , "HSCWHName": data[0]["璋冨嚭浠撳簱"]
+                               
+                                
+                                , "HExplanation": data[0]["HExplanation"]
+                                , "HInvoiceBillNo": data[0]["鍙戠エ缂栧彿"]
+                                , "HProjectID": data[0]["HProjectID"]
+                                , "HProNumber": data[0]["椤圭洰缂栫爜"]
+                                , "HProName": data[0]["椤圭洰鍚嶇О"]
+
+                                , "HRemark": data[0]["琛ㄥご澶囨敞"]
+                                , "HMaker": data[0]["鍒跺崟浜�"]
+                                , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HUpDater": data[0]["淇敼浜�"]
+                                , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HChecker": data[0]["瀹℃牳浜�"]
+                                , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HCloseMan": data[0]["鍏抽棴浜�"]
+                                , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HDeleteMan": data[0]["浣滃簾浜�"]
+                                , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+
+                            });
+
+
+                            option.data = data1;
+                            table.render(option);
+                            form.render('select');
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
             }
             //#endregion
 
@@ -2069,49 +2421,17 @@
                 })
             }
             //#endregion
-
-            //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曡皟鎷ㄧ敵璇峰崟鏁版嵁
-            function getPushSource_MoveStockRequestInBillInit(HSourceInterID, HSourceEntryID) {
-                var res = "none";
-                $.ajax({
-                    url: GetWEBURL() + "/Kf_MoveStockBill/loadKf_MoveStockBillMain_Push",
-                    async: false,
-                    type: "GET",
-                    data: {
-                        "HInterID": HSourceInterID
-                        , "HSubID": HSourceEntryID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            res = result.data[0];
-                        } else {
-                            res = result.data;
-                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        res = "none";
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-                return res;
-            }
             //#endregion
-
-            //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
         });
-      // 鍩虹璧勬枡杩斿洖鏁版嵁
-
+        // 鍩虹璧勬枡杩斿洖鏁版嵁
         function GetHSecManagerValue(obj)  //杩斿洖楠屾敹鍛�
         {
             $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HSecManagerID").val(obj[0].HItemID);
         }
 
-       function GetHKeeperValue(obj)  //杩斿洖淇濈鍛�
-       {
+        function GetHKeeperValue(obj)  //杩斿洖淇濈鍛�
+        {
             $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HKeeperID").val(obj[0].HItemID);
         }
@@ -2131,64 +2451,77 @@
             layui.table.render(option);
         }
 
-         function GetHSCWHValue(obj)  //杩斿洖璋冨嚭浠撳簱
+        function GetHSCWHValue(obj)  //杩斿洖璋冨嚭浠撳簱
         {
             $("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
-             $("#HSCWHID").val(obj[0].HItemID);
-             if (option.data.length > 0) {
-                 for (var i = 0; i < option.data.length; i++) {
-                     if (option.data[i]["HSCWHID"] == 0 || option.data[i]["璋冨嚭浠撳簱"] == undefined) {
-                         option.data[i]["HSCWHID"] = obj[0].HItemID;
-                         option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
-                     }
-                 }
-             }
-             layui.table.render(option);
+            $("#HSCWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HSCWHID"] == 0 || option.data[i]["璋冨嚭浠撳簱"] == undefined) {
+                        option.data[i]["HSCWHID"] = obj[0].HItemID;
+                        option.data[i]["璋冨嚭浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
         }
 
-         function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        function GetHSupValue(obj)  //杩斿洖瀹㈡埛
+        {
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        // 鍩虹璧勬枡杩斿洖鏁版嵁
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
         {
             $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HEmpID").val(obj[0].HItemID);
-        } 
 
-         function GetHManagerValue(obj)  //杩斿洖涓荤
+            getEmpInfoByHEmpID(obj[0].HItemID)
+        }
+
+        function GetHManagerValue(obj)  //杩斿洖涓荤
         {
             $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
-        } 
+        }
 
-          //鍙屽嚮杩斿洖鐗╂枡
-         function GetGyMaterial(data) {
-             OptionData = data
-         }
-           //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+        //鍙屽嚮杩斿洖鐗╂枡
+        function GetGyMaterial(data) {
+            OptionData = data
+        }
+
+        //鍙屽嚮杩斿洖璁¢噺鍗曚綅
         function GetAuxiliaryUnitValue(data) {
-             OptionData = data
-         }
+            OptionData = data
+        }
 
-           //鍙屽嚮杩斿洖鏀舵枡浠撳簱
-         function GetGyWarehouse(data) {
-             OptionData = data
-         }  
-        
-         //鍙屽嚮杩斿洖杈呭姪灞炴��
-         function GetGyProperty(data) {
-             OptionData = data
-         } 
+        //鍙屽嚮杩斿洖鏀舵枡浠撳簱
+        function GetGyWarehouse(data) {
+            OptionData = data
+        }
 
-         //鍙屽嚮杩斿洖浠撲綅
+        //鍙屽嚮杩斿洖杈呭姪灞炴��
+        function GetGyProperty(data) {
+            OptionData = data
+        }
+
+        //鍙屽嚮杩斿洖浠撲綅
         function GetGyStockPlace(data) {
-             OptionData = data
-         }
+            OptionData = data
+        }
+
         //鍙屽嚮杩斿洖璋冨叆浠撳簱
         function GetHWHSubValue(data) {
             OptionData = data[0]
         }
+
         //鍙屽嚮杩斿洖璋冨嚭浠撳簱
         function GetGyWarehouse(data) {
             OptionData = data[0];
         }
+
         //椤圭洰浠g爜
         function GetProjectBillValue(obj) {
             if (obj[0].鍏抽棴浜� == null || obj[0].鍏抽棴浜� == "") {
@@ -2200,6 +2533,31 @@
                 layer.msg("璇ラ」鐩凡鍏抽棴锛屼笉鍙�夋嫨锛�");
             }
         }
+
+        //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+        function getEmpInfoByHEmpID(HEmpID) {
+            $.ajax({
+                url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+                async: false,
+                type: "GET",
+                data: {
+                    "HEmpID": HEmpID
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        $("#HDeptID").val(data.HDeptID);
+                        $("#HDeptName").val(data.HDeptName);
+                    } else {
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
index 204e176..bf3f87e 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus.html"
@@ -335,7 +335,7 @@
                     data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck},
                     success: function (data1) {
                         if (data1.count == 1) {
-                            var totalArray = [];
+                            var totalArray = ["鏁伴噺","浠舵暟"];
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus_Emp.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus_Emp.html"
new file mode 100644
index 0000000..0730aa9
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_ICInventory_Cus_Emp.html"
@@ -0,0 +1,1036 @@
+锘�<!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>
+</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">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HCusName" id="HCusName" style="width:190px;">
+                                    </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="HWHName" id="HWHName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </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 class="layui-row">
+                                    <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                    <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>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                        </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="HMaterName" id="HMaterName" style="width:190px;">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 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_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="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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <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_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
+            var sWhere = "";
+            var HModName = "Kf_ICInventory_Cus_Emp";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "瀹㈡埛鐗╂枡鍗虫椂搴撳瓨鎶ヨ〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            //鍒濆鍖栫晫闈�
+            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_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Kf_ICInventory_Cus_Emp";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_FastQuery(1);
+
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sql) {
+                var ajaxLoad = layer.load();
+                var ModRightNameCheck = "Kf_ICInventory_Cus_Emp";
+                $.ajax({
+                    url: GetWEBURL() + '/CommonModel/searchMethod',
+                    type: "GET",
+                    async:false,
+                    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;
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Kf_ICInventory_Cus_Emp";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            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 HCusName = $("#HCusName").val();
+                var HWHName = $("#HWHName").val();
+                var HMaterNumber = $("#HMaterNumber").val();
+                var HMaterName = $("#HMaterName").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;
+                }
+
+                HOrgID = $("#HOrgID").val();//缁勭粐
+
+                if (HCusName) {
+                    sWhere += " and 瀹㈡埛 like '%" + HCusName + "%'";
+                }
+                if (HWHName) {
+                    sWhere += " and 浠撳簱 like '%" + HWHName + "%'";
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+                }
+
+                sWhere += " and 瀹㈡埛 <> '涔斾竴' ";
+
+                //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+                sWhere += getSWhereByHUser();
+
+                sWhere = sWhere.replaceAll("'", "''");
+
+                var sql = "exec h_p_Kf_ICInventory_Cus '" + sWhere + "'";
+
+                get_Display(sql);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HCusName").val("");//
+                $("#HWHName").val("");
+                $("#HMatrNumber").val("");
+                $("#HMaterName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+
+                $("#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 = "Kf_ICInventory_Cus_Emp_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var 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().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�');  // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+                                    }
+                                }
+                            });
+                            table.exportFile(ins.config.id,data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    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].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#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 (e) {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return Permission;
+            }
+        //#endregion
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮繃婊ゆ潯浠�
+            function getSWhereByHUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data;
+                        } else {
+                            res = result.data;
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+                //res = res.replace("HCusID", "瀹㈡埛鍐呯爜");
+                //res = res.replaceAll("'", "''");
+
+                return res;
+            }
+            //#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);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+        });
+
+            //#endregion
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
index 91ed064..ac7a7cf 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan.html"
@@ -1016,7 +1016,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
@@ -1080,7 +1080,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
@@ -1116,7 +1116,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan_AutoLogin.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan_AutoLogin.html"
index c391191..c419af1 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan_AutoLogin.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill_JiaNan_AutoLogin.html"
@@ -603,7 +603,7 @@
 
                     var HEndQty_Sure = $("#HEndQty_Sure").val();
                     if (HEndQty != HEndQty_Sure) {
-                        layer.msg("灏惧寘鏁伴噺涓庡熬宸寸‘璁や笉涓�鑷达紒锛�", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                        layer.msg("灏惧寘鏁伴噺涓庡熬鍖呯‘璁や笉涓�鑷达紒锛�", { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 2000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
                         return Result = false;
                     }
                 }
@@ -1021,7 +1021,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
@@ -1084,7 +1084,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
@@ -1120,7 +1120,7 @@
                     dataArray.push(temp);
 
                     form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                        "HPOOrderBillNo": dataArray[0].婧愬崟鍗曞彿
+                        "HPOOrderBillNo": dataArray[0].閲囪喘璁㈠崟鍙�
                         , "HSupID": dataArray[0].HSupID
                         , "HSupNumber": dataArray[0].渚涘簲鍟嗕唬鐮�
                         , "HSupName": dataArray[0].渚涘簲鍟�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
index 65a135b..b6b8742 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/Gy_BarCodeReport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
@@ -69,6 +69,7 @@
                                             <option value="AOI4">AOI4</option>
                                             <option value="AVI">AVI</option>
                                             <option value="鐢垫祴">鐢垫祴</option>
+                                            <option value="MRB">MRB</option>
                                         </select>
 
                                     </div>
@@ -538,7 +539,7 @@
                 }
                 get_Display(JSON.stringify(sWhere_2));
                 get_BadReasonCount(JSON.stringify(sWhere_2));
-                get_LotNoCount(JSON.stringify(sWhere_2));
+                //get_LotNoCount(JSON.stringify(sWhere_2));
                 
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
@@ -688,9 +689,9 @@
                     tooltip: {
                         trigger: 'item'
                     },
-                    legend: {
-                        top: 'bottom'
-                    },
+                    //legend: {
+                    //    top: 'bottom'
+                    //},
                     series: [
                         {
                             name: '涓嶈壇鍘熷洜鏁扮洰',
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index db023bf..872f9e4 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/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -496,6 +496,9 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             option.data = result.data;
+                            if(!result.data.length) {
+                                option.data = [{ HCenterID: $('#HItemID').val(), HCenterName: $("#HName").val(), HSourceID: 0, HSourceName: "" }]
+                            }
                             table.render(option);
                         }
 
@@ -812,7 +815,6 @@
             //琛屽唴蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
-                    debugger
                     if (event.key == "F7") {
                         if (obj.event == 'HSourceNameSelect') {
                             layer.open({
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 c60161f..c2beeec 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"
@@ -253,6 +253,9 @@
             case "Kf_OtherOutBillList"://鍏朵粬鍑哄簱鍗曠淮鎶�  鍑哄簱鐮佸崟
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_OtherOutBillList.aspx?linterid=" + value, true, "");
                 break;
+            case "Kf_OtherInBillList"://鍏朵粬鍏ュ簱鍗曠淮鎶�
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_OtherInBillList.aspx?linterid=" + value, true, "");
+                break;
             case "Kf_MoveStockBillList"://鐩存帴璋冩嫧鍗曠淮鎶�
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Kf_MoveStockBillList.aspx?linterid=" + value, true, "");
                 break;
@@ -332,7 +335,11 @@
             case "Xs_SeOrderBill_StockInCodeNote": //閿�鍞鍗� 鍏ュ簱鐮佸崟
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx?linterid=" + value, true, "");
                 break;
-            case "HBarCodePrint"://鐗╂枡鏉$爜鎵撳嵃
+            case "HBarCodePrint"://鐗╂枡鏉$爜鎵撳嵃锛堟柉鑾皵鐧芥爣鎵撳嵃锛�
+                var ListTrue = value.split('|');
+                CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + ListTrue[0] + "&entryid=" + ListTrue[1], true, "");
+                break;
+            case "MES_ProductionLinePackagingList"://浜х嚎鍖呰鍗曪紙鏂帿灏旂櫧鏍囨墦鍗帮級
                 var ListTrue = value.split('|');
                 CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlSRM_Web_BarCodeBillList.aspx?linterid=" + ListTrue[0] + "&entryid=" + ListTrue[1], 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_Kf_OtherInBillList.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_Kf_OtherInBillList.aspx"
new file mode 100644
index 0000000..bfaa3dc
--- /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_Kf_OtherInBillList.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Kf_OtherInBillList.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Kf_OtherInBillList" %>
+
+<!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 * from h_v_Kf_OtherInBillList_Print where hmainid = " + Request.Params["linterid"]);
+    }
+</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_Kf_OtherInBillList.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_Kf_OtherInBillList.aspx.cs"
new file mode 100644
index 0000000..c8597b5
--- /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_Kf_OtherInBillList.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_Kf_OtherInBillList : 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_Kf_OtherInBillList.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_Kf_OtherInBillList.aspx.designer.cs"
new file mode 100644
index 0000000..970bb01
--- /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_Kf_OtherInBillList.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+    public partial class xmlLBM_Kf_OtherInBillList
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index e803055..eab051f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -15,6 +15,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    
 </head>
 <body>
     <div class="layui-fluid">
@@ -86,7 +87,7 @@
                                             <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-row" style=" margin-top: 10px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
@@ -114,7 +115,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                    <div class="layui-row" style=" margin-top: 10px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html"
index 144bba0..576fd2a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsEdit.html"
@@ -1,11 +1,13 @@
 锘�<!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">
+    <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">
@@ -15,6 +17,7 @@
     <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/dayjs.min.js"></script>
     <style>
         .layui-form-item .layui-inline {
             margin-top: 5px;
@@ -27,14 +30,17 @@
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid" style="padding: 0;">
         <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
                     <div style="padding: 10px; ">
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
-                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+                            lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit=""
+                            lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-Gy_ShiftsEdit">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -49,21 +55,30 @@
                                         <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" lay-verify="HNumber" name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
+                                                <input type="text" class="layui-input" lay-verify="HNumber"
+                                                    name="HNumber" id="HNumber" placeholder="璇疯緭鍏ュ唴瀹�">
                                             </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" lay-verify="HName" name="HName" id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
+                                                <input type="text" class="layui-input" lay-verify="HName" name="HName"
+                                                    id="HName" placeholder="璇疯緭鍏ュ唴瀹�">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+                                            <label class="layui-form-label"
+                                                style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName"
+                                                    name="HDeptName" id="HDeptName"
+                                                    style="background-color:#efefef4d;width: 60%;display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" lay-verify="HDeptID" name="HDeptID" id="HDeptID"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHDept" id="btnHDept"
+                                                    style="padding: 0 10px;float: right;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -73,19 +88,26 @@
                                         <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" lay-verify="HBeginTimes" name="HBeginTimes" id="HBeginTimes" onfocus="this.select();">
+                                                <input type="text" class="layui-input" lay-verify="HBeginTimes"
+                                                    name="HBeginTimes" id="HBeginTimes" placeholder="HH:MM"
+                                                    onfocus="this.select();">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">缁撴潫鏃堕棿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HEndTimes" name="HEndTimes" id="HEndTimes" onfocus="this.select();">
+                                                <input type="text" class="layui-input" lay-verify="HEndTimes"
+                                                    name="HEndTimes" id="HEndTimes" placeholder="HH:MM"
+                                                    onfocus="this.select();">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">宸ヤ綔鏃堕棿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" name="HWorkTimes" id="HWorkTimes" lay-verify="HWorkTimes" onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                <input type="text" name="HWorkTimes" id="HWorkTimes"
+                                                    lay-verify="HWorkTimes"
+                                                    onkeyup="if(!this.value.match(/^[\+\-]?\d*?\.?\d*?$/)){if(!this.t_value>0){this.value=''}else{this.value=this.t_value;}}else this.t_value=this.value;if(this.value.match(/^(?:[\+\-]?\d+(?:\.\d+)?)?$/))this.o_value=this.value"
+                                                    autocomplete="off" class="layui-input" onfocus="this.select();">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -96,7 +118,8 @@
                                         <div class="layui-inline" style="width: 965px;">
                                             <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" onmouseover="this.title=this.value">
+                                                <input type="text" class="layui-input" lay-verify="HRemark"
+                                                    name="HRemark" id="HRemark" onmouseover="this.title=this.value">
                                             </div>
                                         </div>
                                     </div>
@@ -111,7 +134,9 @@
                                         </div>
                                         <div class="layui-inline">
                                             <div class="layui-input-block" style="margin-left: 200px;">
-                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤" disabled="disabled">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag"
+                                                    lay-skin="primary" lay-filter="checkboxHStopflag" value="true"
+                                                    title="鏄惁绂佺敤" disabled="disabled">
                                                 <input type="hidden" value="false" name="HStopflag" id="HStopflag">
                                             </div>
                                         </div>
@@ -126,13 +151,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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp"
+                                                    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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -140,13 +167,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="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeTime" id="HMakeTime"
+                                                    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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckTime" id="HCheckTime"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -154,13 +183,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="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HModifyEmp" id="HModifyEmp"
+                                                    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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HStopEmp" id="HStopEmp"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -168,13 +199,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="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HModifyTime"
+                                                    id="HModifyTime" 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="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HStopTime" id="HStopTime"
+                                                    style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -183,7 +216,8 @@
                                     <div class="layui-row" style="display:none;">
                                         <div class="layui-inline">
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID" value="0">
+                                                <input type="hidden" lay-verify="HItemID" name="HItemID" id="HItemID"
+                                                    value="0">
                                             </div>
                                         </div>
                                     </div>
@@ -202,13 +236,15 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
 
-        //#region 鍏叡鍙橀噺
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
-                , element = layui.element;
+                , element = layui.element
+                // 鏃ユ湡鎻掍欢
+                , laydate = layui.laydate;
             var HItemID = $('#HItemID').val()
             var HMaker = sessionStorage["HUserName"]
             var HUSEORGID = sessionStorage["OrganizationID"]  //缁勭粐ID
@@ -224,6 +260,8 @@
 
             //鑾峰彇缁勭粐
             Organ();
+            // 鍒濆鍖栬〃鍗�
+            Init_GridForm()
 
             //#region   鑾峰彇缁勭粐
             function Organ() {
@@ -248,6 +286,8 @@
                 })
             }
             //#endregion
+
+
 
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
@@ -287,7 +327,7 @@
                             if (IsHStopflag) {
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                             }
-                            if (data.瀹℃牳浜�!="") {
+                            if (data.瀹℃牳浜� != "") {
                                 $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             if (data.HUSEORGID != 0) {
@@ -384,6 +424,30 @@
 
             //#region 鍔熻兘鎺т欢
 
+            function Init_GridForm() {
+                laydate.render({
+                    elem: '#HBeginTimes',
+                    type: 'time',
+                    format: 'HH:mm',
+                    done: () => {
+                        CalcTimesGap()
+                    }
+                });
+
+                laydate.render({
+                    elem: '#HEndTimes',
+                    type: 'time',
+                    format: 'HH:mm',
+                    done: () => {
+                        CalcTimesGap()
+                    }
+                });
+
+                var beginTime = dayjs(Date.now()).format("HH:mm")
+                $("#HBeginTimes").val(beginTime)
+                $("#HEndTimes").val(beginTime)
+            }
+
             //#region 淇濆瓨
 
             //淇濆瓨鎸夐挳
@@ -448,10 +512,11 @@
 
             //#endregion
 
+            function CalcTimesGap() {
+                
+            }
+
             //#endregion
-
-
-
         });
 
         //浠ヤ笂涓簂ayui妯″潡
@@ -465,4 +530,5 @@
         }
     </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
index efbedce..8e23dad 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ShiftsList.html"
@@ -15,7 +15,7 @@
     <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/HideButton.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <style>
         .layui-form-select .layui-input {
@@ -99,7 +99,7 @@
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
+                            <div class="layui-btn-container" id="btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddNew" id="btn_AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Modify" id="btn_Modify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
@@ -147,6 +147,7 @@
             var option = [];
             var columns = "";
             var HModName = "Gy_ShiftsList";
+            var HBillType = "Gy_ShiftsList";
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
             var params = get_UrlVars();
             var Type = params[params[0]];
@@ -342,8 +343,8 @@
                         }
 
                         //鍒锋柊鎸夐挳鏄剧ず
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        Display_HideButton(btns, HModName, HModName, HMaker);
+                        // var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton('btn-container', HModName, HModName, HMaker);
 
                     },
                     complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
@@ -460,7 +461,7 @@
                     //鎸夐挳璁剧疆
                     case 'btn_HideButton':
                         var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        get_HideButton(btns, HModName, HModName, HMaker);
+                        get_HideButton('btn-container', HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                     //閫�鍑烘寜閽�
                     case 'btn_Exit': Pub_Close(2);
@@ -752,14 +753,14 @@
                 for (var i = 1; i < option.cols[0].length - 1; i++) {
                     colName += option.cols[0][i]["title"] + ",";
                 }
-                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
-                var urlLen = urlStr.split('/');
-                for (var i = 0; i < urlLen.length - 4; i++) {
-                    contentUrl += "../";
-                }
-                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                // var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                // var urlLen = urlStr.split('/');
+                // for (var i = 0; i < urlLen.length - 4; i++) {
+                //     contentUrl += "../";
+                // }
+                // colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
 
-                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+                contentUrl += '../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
 
                 layer.open({
                     type: 2
@@ -940,7 +941,7 @@
 
                             //鍒锋柊鎸夐挳鏄剧ず
                             var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            Display_HideButton(btns, HModName, HModName, HMaker);
+                            Display_HideButton('btn-container', HModName, HModName, HMaker);
 
                             layer.close(ajaxLoad);
                             //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 4e40587..35e9448 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -360,7 +360,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                // get_FastQuery(1);
+                get_FastQuery(1);
 
                 get_DefaultModule();//鍔犺浇鏂规
              
@@ -1090,7 +1090,7 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery(1);
+                            // get_FastQuery(1);
                             form.render("select");
                         }
                     }, error: function () {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 686a869..15a1d90 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -38,49 +38,64 @@
                                     <label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
-                                            id="HNumber">
+                                               id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName"
-                                            id="HName">
+                                               id="HName">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HUSEORGName"
+                                               id="HUSEORGName">
+                                        <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">
+                                        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>
+                                        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>
+                                         id="HFilterScheme_Now"></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="HNumber2"
-                                            id="HNumber2" style="width:190px;">
+                                               id="HNumber2" style="width:190px;">
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
-                                    lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+                                        lay-filter="btnResCnz" 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" class="ForFilteringSchemes"
-                                                    lay-filter="ColName" style="width:190px;">
+                                                        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;">
+                                                    lay-filter="Comparator" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -100,7 +115,7 @@
                                         </div>
                                         <div class="layui-inline">
                                             <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent" id="ColContent">
+                                                   name="ColContent" id="ColContent">
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-top:5px">
@@ -108,13 +123,13 @@
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
                                                 <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
-                                                    lay-filter="ColName1" style="width:190px;">
+                                                        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;">
+                                                    lay-filter="Comparator1" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -134,7 +149,7 @@
                                         </div>
                                         <div class="layui-inline">
                                             <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent1" id="ColContent1">
+                                                   name="ColContent1" id="ColContent1">
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-top:5px">
@@ -142,13 +157,13 @@
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
                                                 <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
-                                                    lay-filter="ColName2" style="width:190px;">
+                                                        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;">
+                                                    lay-filter="Comparator2" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -168,7 +183,7 @@
                                         </div>
                                         <div class="layui-inline">
                                             <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent2" id="ColContent2">
+                                                   name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -432,6 +447,9 @@
 
                 //鏍戠姸鍥剧敓鎴�
                 get_Display_Tree();
+
+                //缁勭粐涓嬫媺妗�
+                Organ();
             }
 
             //鍒濆鍖栬〃鏍�
@@ -480,6 +498,7 @@
                 var index = layer.load(0, { shade: false });
                 var ajaxLoad = layer.load();
                 sWhere += addSWhereByOpenType();
+                Organization = $("#HUSEORGID").val();
                 $.ajax({
                     url: GetWEBURL() + '/Gy_Supplier/list',
                     type: "GET",
@@ -547,11 +566,33 @@
                 });
                 layer.close(index);
             }
-
+             //#region 鑾峰彇缁勭粐
+        function Organ() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            $.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["OrganizationID"])
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
             //#region 鍒嗛〉鏌ヨ
             function get_DisplayPage(sWhere) {
                 var ajaxLoad = layer.load();
                 sWhere += addSWhereByOpenType();
+                Organization = $("#HUSEORGID").val();
                 $.ajax({
                     url: GetWEBURL() + '/Gy_Supplier/page',
                     type: "GET",
@@ -665,6 +706,7 @@
                 var ColName2 = $("#ColName2").val();//澶嶉�夋
                 var Comparator2 = $("#Comparator2").val()
                 var ColContent2 = $("#ColContent2").val();
+                var HUSEORGID = $("#HUSEORGID").val();
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
                     switch (Comparator) {
@@ -734,7 +776,6 @@
                 if (HName) {
                     sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
                 }
-
                 get_DisplayPage(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index 9d0eba0..b488e9f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -12,7 +12,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
-    <script src="../../../layuiadmin/zy_DragObserver.js"></script>
+    <!-- <script src="../../../layuiadmin/zy_DragObserver.js"></script> -->
     <style>
         /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
         /*.layui-table-cell {
@@ -379,7 +379,7 @@
                         form.render('checkbox');
                         form.render('select');
 
-                        registerDragObserver()
+                        // registerDragObserver()
                         layer.close(ajaxLoad);
                     } else {
                         var colTitleNames = colTitleName.split(',');
@@ -535,39 +535,39 @@
         }
 
         //// 娉ㄥ唽鎷栨嫿瑙傚療鑰咃紝鐩戝惉琛ㄦ牸鎷栨嫿鍙樺寲
-        function registerDragObserver() {
-            // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
-            if (typeof window.MutationObserver === 'undefined'
-                && typeof window.WebKitMutationObserver === 'undefined') {
-                console.warn('observer not supported')
-                return
-            }
-            let targetEl = $(".layui-table-box")[0];
-            let config = {
-                attributes: true,
-                attributesOldValue: true,
-                attributeFilter: ['class'],
-                childList: false,
-                subtree: false,
-                characterData: false,
-                characterDataOldValue: false
-            };
-            let observer = new MutationObserver(mutations => {
-                mutations.forEach(function (mutation) {
-                    if (mutation.attributeName === 'class') {
-                        // 鐩戝惉class涓唴瀹圭殑鍙樺寲
-                        if ($(targetEl).hasClass('noselect')) {
-                            document.documentElement.style.userSelect = 'none';
-                            document.documentElement.style.webkitUserSelect = 'none';
-                        } else {
-                            document.documentElement.style.userSelect = '';
-                            document.documentElement.style.webkitUserSelect = '';
-                        }
-                    }
-                })
-            })
-            observer.observe(targetEl, config);
-        }
+        // function registerDragObserver() {
+        //     // 濡傛灉涓嶆敮鎸侊紝鍒欎粈涔堥兘涓嶆墽琛�
+        //     if (typeof window.MutationObserver === 'undefined'
+        //         && typeof window.WebKitMutationObserver === 'undefined') {
+        //         console.warn('observer not supported')
+        //         return
+        //     }
+        //     let targetEl = $(".layui-table-box")[0];
+        //     let config = {
+        //         attributes: true,
+        //         attributesOldValue: true,
+        //         attributeFilter: ['class'],
+        //         childList: false,
+        //         subtree: false,
+        //         characterData: false,
+        //         characterDataOldValue: false
+        //     };
+        //     let observer = new MutationObserver(mutations => {
+        //         mutations.forEach(function (mutation) {
+        //             if (mutation.attributeName === 'class') {
+        //                 // 鐩戝惉class涓唴瀹圭殑鍙樺寲
+        //                 if ($(targetEl).hasClass('noselect')) {
+        //                     document.documentElement.style.userSelect = 'none';
+        //                     document.documentElement.style.webkitUserSelect = 'none';
+        //                 } else {
+        //                     document.documentElement.style.userSelect = '';
+        //                     document.documentElement.style.webkitUserSelect = '';
+        //                 }
+        //             }
+        //         })
+        //     })
+        //     observer.observe(targetEl, config);
+        // }
 
         //#endregion
 
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoReport.html"
index e04250c..f8f76d3 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoReport.html"
@@ -29,16 +29,16 @@
                                         <span>鏇村</span>
                                     </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" style="width:190px;">
+                                <div class="layui-form layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
+                                    <div class="layui-input-block" style="position:relative; left:-45px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" id="HDate" placeholder="yyyy-MM-dd HH:mm:ss" style="width:140px;">
                                     </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" style="width:190px;">
+                                <div class="layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:5px;">-</label>
+                                    <div class="layui-input-block" style="position:relative; left:-70px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" id="HDate1" placeholder="yyyy-MM-dd HH:mm:ss" style="width:140px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -304,9 +304,23 @@
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
-                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨椂闂�
+                var HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
+                var HDate1 = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
+                laydate.render({
+                    elem: '#HDate',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate
+                });
+                laydate.render({
+                    elem: '#HDate1',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate1
+                });
 
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -409,8 +423,18 @@
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(number) {
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HDate = $("#HDate").val();      //寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();    //缁撴潫鏃ユ湡
+                if (HDate == '') {
+                    HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                } else {
+                    HDate = $("#HDate").val() + ":00:00";                                                                           //涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                }
+                if (HDate1 == '') {
+                    HDate1 = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";                         //缁撴潫鏃ユ湡
+                } else {
+                    HDate1 = $("#HDate1").val() + ":00:00";                                                                         //缁撴潫鏃ユ湡
+                }
 
                 var HCusName = $("#HCusName").val();
                 var HMaterNumber = $("#HMaterNumber").val();
@@ -513,7 +537,7 @@
                 //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
                 sWhere += getSWhereByHUser();
 
-                var sql = "select * from h_v_Xs_CusShouGongChaoBaoReport where 1=1 " + sWhere + " order by 鏃ユ湡 desc,HCusID,HMaterID";
+                var sql = "select * from h_v_Xs_CusShouGongChaoBaoReport where 1=1 " + sWhere + " order by 瀹℃牳鏃ユ湡 desc,HCusID,HMaterID";
 
                 get_Display(sql);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -522,9 +546,23 @@
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
-                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
-                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨椂闂�
+                var HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+                var HDate1 = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+                laydate.render({
+                    elem: '#HDate',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate
+                });
+                laydate.render({
+                    elem: '#HDate1',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate1
+                });
                 $("#HCusName").val("");//
                 $("#HMatrNumber").val("");
                 $("#HMaterName").val("");
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoSumReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoSumReport.html"
new file mode 100644
index 0000000..4cc5d5e
--- /dev/null
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_CusShouGongChaoBaoSumReport.html"
@@ -0,0 +1,1087 @@
+锘�<!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>
+</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-form layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:35px;">鏃ユ湡</label>
+                                    <div class="layui-input-block" style="position:relative; left:-45px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" id="HDate" placeholder="yyyy-MM-dd HH:mm:ss" style="width:140px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline" style="width:200px;">
+                                    <label class="layui-form-label" style="width:5px;">-</label>
+                                    <div class="layui-input-block" style="position:relative; left:-70px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" id="HDate1" placeholder="yyyy-MM-dd HH:mm:ss" style="width:140px;">
+                                    </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="HCusName" id="HCusName" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                        <select name="HOrgID" id="HOrgID" class="ForFilteringSchemes" lay-verify="HOrgID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </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 class="layui-row">
+                                    <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                    <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>
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                        </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="HMaterName" id="HMaterName" style="width:190px;">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style=" margin-top: 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_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="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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                <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_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
+            var sWhere = "";
+            var HModName = "Xs_CusShouGongChaoBaoSumReport";
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = [];
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "瀹㈡埛鎵嬪伐鎶勫寘姹囨�绘姤琛�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            //鍒濆鍖栫晫闈�
+            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_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Xs_CusShouGongChaoBaoSumReport";
+                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨椂闂�
+                var HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
+                var HDate1 = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
+                laydate.render({
+                    elem: '#HDate',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate
+                });
+                laydate.render({
+                    elem: '#HDate1',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate1
+                });
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_FastQuery(1);
+
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sql) {
+                var ajaxLoad = layer.load();
+                var ModRightNameCheck = "Xs_CusShouGongChaoBaoSumReport";
+                $.ajax({
+                    url: GetWEBURL() + '/CommonModel/searchMethod',
+                    type: "GET",
+                    async:false,
+                    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;
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Xs_CusShouGongChaoBaoSumReport";
+                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            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 HDate = $("#HDate").val();      //寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();    //缁撴潫鏃ユ湡
+                if (HDate == '') {
+                    HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                } else {
+                    HDate = $("#HDate").val() + ":00:00";                                                                           //涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+                }
+                if (HDate1 == '') {
+                    HDate1 = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";                         //缁撴潫鏃ユ湡
+                } else {
+                    HDate1 = $("#HDate1").val() + ":00:00";                                                                         //缁撴潫鏃ユ湡
+                }
+
+                var HCusName = $("#HCusName").val();
+                var HMaterNumber = $("#HMaterNumber").val();
+                var HMaterName = $("#HMaterName").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;
+                }
+
+                HOrgID = $("#HOrgID").val();//缁勭粐
+
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 20) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 20) <= '" + HDate1 + "'";
+                }
+                if (HCusName) {
+                    sWhere += " and 瀹㈡埛 like '%" + HCusName + "%'";
+                }
+                if (HMaterNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HMaterNumber + "%'";
+                }
+                if (HMaterName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
+                }
+
+                //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+                sWhere += getSWhereByHUser();
+
+                var sql = "select * from h_v_Xs_CusShouGongChaoBaoSumReport where 1=1 " + sWhere + " order by 瀹℃牳鏃ユ湡 desc,HCusID,HMaterID";
+
+                get_Display(sql);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                //鍒濆鍖栨椂闂�
+                var HDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+                var HDate1 = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
+                laydate.render({
+                    elem: '#HDate',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate
+                });
+                laydate.render({
+                    elem: '#HDate1',
+                    type: 'datetime',
+                    fullPanel: true
+                    , format: 'yyyy-MM-dd HH'
+                    , value: HDate1
+                });
+                $("#HCusName").val("");//
+                $("#HMatrNumber").val("");
+                $("#HMaterName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+
+                $("#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 = "Xs_CusShouGongChaoBaoReport_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var 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().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                        item[itemobj] = item[itemobj].toString().replaceAll(/[,]+/g, '锛�');  // 灏嗘崲鍒嗗彿鏇挎崲涓虹┖瀛楃涓�
+                                    }
+                                }
+                            });
+                            table.exportFile(ins.config.id,data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    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].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#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 (e) {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return Permission;
+            }
+        //#endregion
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮繃婊ゆ潯浠�
+            function getSWhereByHUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data;
+                        } else {
+                            res = result.data;
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+                //res = res.replace("HCusID", "瀹㈡埛鍐呯爜");
+                //res = res.replaceAll("'", "''");
+
+                return res;
+            }
+            //#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);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠$悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+        });
+
+            //#endregion
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
index 9868bb9..3934570 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
@@ -15,6 +15,26 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/HideButton.js"></script>
+    <style>
+        .loader {
+            border: 8px solid #f3f3f3; /* Light grey */
+            border-top: 8px solid #3498db; /* Blue */
+            border-radius: 50%;
+            width: 50px;
+            height: 50px;
+            animation: spin 2s linear infinite;
+        }
+
+        @keyframes spin {
+            0% {
+                transform: rotate(0deg);
+            }
+
+            100% {
+                transform: rotate(360deg);
+            }
+        }
+    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -703,26 +723,31 @@
                             }
                         }
 
+                        //鑾峰彇闇�瑕佷笂浼犵殑妫�楠屼俊鎭垪琛�
+                        var HDataList_submit = [];
                         for (var i = 0; i < HBatchDeletePCSList.length; i++) {
                             var title = HBatchDeletePCSList[i].title;
                             var HBarCode_PNL_Note = HBatchDeletePCSList[i].HBarCode;
                             var SetNo = HBatchDeletePCSList[i].HSetNo;
                             var PCSNo = HBatchDeletePCSList[i].HPCSNo;
 
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: 'AVI鏂板锛�' + title + ')',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['1px', '1px'],
-                                maxmin: true,
-                                content: '../../璐ㄩ噺绠$悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html?OperationType=8&linterid=&HSouceBillType=10004&HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&HPCSNo=" + PCSNo + "&HBadReason=" + encodeURIComponent(HBadReason),
-                                end: function () {
-                                    $("#btnSearch").trigger('click');
-                                }
-                            });
+                            var data = {
+                                HBarCode: HBarCode_PNL_Note
+                                , HSetNo: SetNo
+                                , HPCSNo: PCSNo
+                                , HCheckProc: "MRB"
+                                , HPageIndex: "L4"
+                                , HBadReason: HBadReason
+                                , HPosition_x: "0"
+                                , HPosition_y: "0"
+                                , HItemID: "0"
+                                , HMakeDate: Format(new Date(), "yyyy-MM-dd")
+                                , HMaker: sessionStorage["HUserName"]
+                            }
+                            HDataList_submit.push(data);
                         }
+
+                        batchDelete_Submit(HDataList_submit);
 
                         HBatchDeletePCSList = [];
                         $("#btnSearch").trigger('click');
@@ -747,6 +772,74 @@
             }
             //#endregion
 
+            //#region 鎵归噺鍒掑簾-涓婁紶妫�楠屼俊鎭褰�
+            function batchDelete_Submit(HDataList_submit) {
+                var msg = "";                                               //杩斿洖淇℃伅
+
+                //閬嶅巻涓婁紶
+                var submitList = [];                                        //涓婁紶鏁版嵁鍒楄〃
+                var submitCount = 100;                                      //鍗曟鍙笂浼犳暟閲�+1
+                for (var i = 0; i < HDataList_submit.length; i++) {
+                    if ((i + 1) % submitCount > 0 && i + 1 != HDataList_submit.length) {
+                        submitList.push(HDataList_submit[i]);
+                    } else {
+                        //鎵撳紑鍔犺浇閬僵
+                        var index = layer.open({
+                            type: 1, // page 灞傜被鍨�
+                            area: ['20%', '20%'],
+                            shade: 0.6, // 閬僵閫忔槑搴�
+                            shadeClose: false, // 鐐瑰嚮閬僵鍖哄煙锛屼笉鍏抽棴寮瑰眰
+                            maxmin: false, // 涓嶅厑璁稿叏灞忔渶灏忓寲
+                            anim: 0, // 0-6 鐨勫姩鐢诲舰寮忥紝-1 涓嶅紑鍚�
+                            content: '<div style="padding: 12px;">姝e湪杩愮畻,璇疯�愬績绛夊緟!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
+                        });
+
+                        submitList.push(HDataList_submit[i]);
+                        var sMainStr = JSON.stringify(submitList) + ';' + sessionStorage["HUserName"];
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/BatchAddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: false,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    //鍏抽棴鍔犺浇閬僵
+                                    layer.close(index);
+                                }
+                                else {
+                                    for (var j = 0; j < submitList.length; j++) {
+                                        msg += "銆�" + submitList.HPCSNo + "銆�";
+                                    }
+                                    msg += "涓婁紶澶辫触锛屽師鍥狅細" + data.Message + ";";
+                                    //鍏抽棴鍔犺浇閬僵
+                                    layer.close(index);
+                                }
+                            },
+                            error: function (err) {
+                                for (var j = 0; j < submitList.length; j++) {
+                                    msg += "銆�" + submitList.HPCSNo + "銆�";
+                                }
+                                msg += "涓婁紶澶辫触锛屽師鍥狅細" + err.Message + ";";
+                                //鍏抽棴鍔犺浇閬僵
+                                layer.close(index);
+                            }
+                        });
+
+                        submitList = [];
+                    }
+                }
+                
+
+                if (msg.length > 0) {
+                    layer.alert(msg, { icon: 5 });
+                    return false;
+                } else {
+                    return true;
+                }
+            }
+            //#endregion
+
             //#region 鍒ゆ柇璇NL涓嬬殑璇CS鏄惁宸茬粡瀛樺湪涓嶈壇璁板綍銆傝嫢瀛樺湪锛屽垯涓嶅厑璁哥户缁敓鎴愩��
             function judgeRepeatDataByPNLAndPCS(HBarCode_Temp, HPCSNo_Temp) {
                 var flag = true;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList_JiaNan.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_JiaNan.html"
index a062909..f277ffc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_BarCodeBillList_JiaNan.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_JiaNan.html"
@@ -711,6 +711,110 @@
                 DisPlay_HideColumn();
             }
 
+            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 + "%''";
+                }
+
+                get_DisplayPage(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
             //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
             function set_DropBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
@@ -756,7 +860,7 @@
             function set_DropBatchBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                if (checkStatus.data.length > 0) {
+                if (checkStatus.data.length > 0 && checkStatus.data.length <=100) {
                     var HInterIDListStr = "";
                     for (var i = 0; i < data.length; i++) {
                         if (i == data.length - 1) {
@@ -795,6 +899,9 @@
                         }
                     });
                 }
+                else if (checkStatus.data.length > 100) {
+                    layer.msg(get_MessageError('[0000-1-021]閫夋嫨鏁版嵁涓嶅彲澶т簬100鏉★紒', sessionStorage["HTranSlate"]));
+                }
                 else {
                     layer.msg(get_MessageError('[0000-1-021]璇烽�夋嫨鏁版嵁浣滃簾锛�', sessionStorage["HTranSlate"]));
                 }
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_MouldFile.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_MouldFile.html"
index 31bde5a..7400c03 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.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_MouldFile.html"
@@ -758,7 +758,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HMouleTypeName").val(checkStatus.data[0].HName);
+                        $("#HMouleTypeName").val(checkStatus.data[0].鍣ㄥ叿鍒嗙被鍚嶇О);
                         $("#HMouleTypeID").val(checkStatus.data[0].HItemID);
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
index 3c4e4be..285830a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/OA_ErrMsgBackHandleBillMain.html"
@@ -1301,6 +1301,10 @@
                 layer.msg("鎺ユ敹浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
+            if ($("#HHandleNote").val() == '' || $("#HHandleNote").val() == null) {
+                layer.msg("澶勭悊鍐呭涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
            
            
             return Result;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
index 7563706..ee052db 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_MESExecptFeedBackBillList.html"
@@ -433,7 +433,9 @@
 
                 //鍗曟嵁鍙疯秴閾炬帴
                 if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
-                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                    var HEntryID = data.HEntryID.toString();
+
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
                         type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -443,7 +445,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: 'Sc_Add_MESExecptFeedBackBillList.html?OperationType=3&linterid=' + linterid + '&HEntryID=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , content: 'Sc_Add_MESExecptFeedBackBillList.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
                             get_FastQuery(table, option);
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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
index e0e9bc9..e532199 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.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/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html"
@@ -1708,10 +1708,14 @@
                     return false;
                 }
 
-                //if ($("#HDeptID").val() == "0") {
-                //    layer.msg("鐢熶骇杞﹂棿鏈�夋嫨!");
-                //    return false;
-                //}
+                if ($("#HDeptID").val() == "0" || $("#HDeptID").val() == undefined || $("#HDeptID").val() == null) {
+                    layer.msg("鐢熶骇杞﹂棿鏈�夋嫨!");
+                    return false;
+                }
+                if ($("#HDeptName").val() == "") {
+                    layer.msg("鐢熶骇杞﹂棿鏈�夋嫨!");
+                    return false;
+                } 
 
                 if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == undefined || $("#HEmpID").val() == null || $("#HEmpName").val() == "") {
                     layer.msg("鐧昏浜烘湭閫夋嫨!");
@@ -1743,6 +1747,14 @@
                     //    layer.msg("绗�" + (i + 1) + "琛岋細宸ュ簭淇℃伅涓嶅厑璁镐负绌猴紒");
                     //    return false;
                     //}
+                    if (option.data[i]["HNowProcID"] == 0 || option.data[i]["HNowProcID"] == undefined || option.data[i]["HNowProcID"] == null) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細褰撳墠宸ュ簭涓嶅厑璁镐负绌猴紒");
+                        return false;
+                    }
+                    if (option.data[i]["HBadProcID"] == 0 || option.data[i]["HBadProcID"] == undefined || option.data[i]["HBadProcID"] == null) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璐d换宸ュ簭涓嶅厑璁镐负绌猴紒");
+                        return false;
+                    }
                     if (option.data[i]["HResult"] == 0 || option.data[i]["HResult"] == undefined || option.data[i]["HResult"] == null) {
                         layer.msg("绗�" + (i + 1) + "琛岋細鍒ゅ畾缁撴灉涓嶅厑璁镐负绌猴紒");
                         return false;
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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index d2276a2..56630bb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -924,6 +924,7 @@
                 if (Source) {
                     sWhere += " and 鐢熶骇璧勬簮 like '%" + Source + "%'";
                 }
+                sWhere += " and 鍒跺崟浜� !=鑷姩鐢熸垚";
                 //if (HOrgID) {
                 //    sWhere += " and HOrgID = '" + HOrgID + "'";
                 //}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index a7e63a6..358febd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -315,9 +315,9 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get-saveCustTag" id="saveCustTag"><i class="layui-icon layui-icon-print"></i>閲嶆柊鐢熸垚瀹㈡埛鏍囩</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="export"><i class="layui-icon layui-icon-export"></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" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PatrolProcCheck" id="btn-PatrolProcCheck">宸℃</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-LastProcCheck" id="btn-LastProcCheck">鏈</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck"><i class="layui-icon layui-icon-form"></i>棣栨</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PatrolProcCheck" id="btn-PatrolProcCheck"><i class="layui-icon layui-icon-form"></i>宸℃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-ProcessCheck" id="btn-ProcessCheck"><i class="layui-icon layui-icon-form"></i>鏈</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Remark" id="set_Remark"><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>
@@ -623,8 +623,8 @@
                     //宸℃
                     case 'btn-PatrolProcCheck': set_PatrolProcCheck();
                         break;
-                    //宸℃
-                    case 'btn-LastProcCheck': set_LastProcCheck();
+                    //鏈
+                    case 'btn-ProcessCheck': set_ProcessCheck();
                         break;
                     //鍖呰澶囨敞
                     case 'set_Remark': set_Remark();
@@ -2030,8 +2030,61 @@
                         , anim: 0
                         , content: ['../../璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
                         , resize: false
-                        , cancel: function () {
-                            btnIs();
+                        , cancel: function () {                         
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+        
+            //宸℃
+            function set_PatrolProcCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var OperationType = 2;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸℃妫�楠屽崟-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['../../璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {                        
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鏈
+            function set_ProcessCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var OperationType = 2;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏈欢妫�楠屽崟-缂栬緫'
+                        , shade: 0.6
+                        , maxmin: false
+                        , anim: 0
+                        , content: ['../../璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3710&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {                          
                         }
                         , end: function () {
                             get_FastQuery(table, option);
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
index 772bd00..2b90ad8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ICMOSortBillList.html"
@@ -221,6 +221,7 @@
                     , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 100, sort: true }
                     , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 120, sort: true }
                     , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', sort: true }
+                    , { field: '璧勬簮鍚嶇О', title: '璧勬簮鍚嶇О', sort: true }
                     , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
                     , { field: '鐘舵��', title: '鐘舵��', sort: true }
                     , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
index aa27ff0..dce7f71 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
@@ -353,12 +353,12 @@
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鏌ヨ
-                get_Display(sWhere);
+               
                 //鍒濆鍖栨棩鏈�
                 $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
+                //鏌ヨ
+                get_FastQuery();
                 ColFilter();
             }
             //琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 04fb572..deceb00 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -1953,7 +1953,7 @@
                     $.ajax({
                         url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
                         type: "GET",
-                        data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
+                        data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "" },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { icon: 1 });
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fe33f2d..833dd3b 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -142,7 +142,7 @@
                                             <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-row" style=" margin-top: 10px; ">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
@@ -170,7 +170,7 @@
                                         </div>
                                     </div>
 
-                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+                                    <div class="layui-row" style=" margin-top: 10px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
@@ -845,7 +845,7 @@
                                 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: '鍗曟嵁鍙�' });
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�'});
                                 } else {
                                     switch (data[i].Type) {
                                         //int
@@ -900,7 +900,7 @@
                             option.data = result;
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
-                           table.render(option);
+                            table.render(option);
 
                             //鍒锋柊鎸夐挳鏄剧ず
                             Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
@@ -1097,7 +1097,7 @@
                                 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 (data[i].name == '鍗曟嵁鍙�') {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', style:"color:blue; cursor: pointer;" });
                                 } else {
                                     switch (data[i].Type) {
                                         //int
@@ -1135,10 +1135,13 @@
                                 }
                             }
                             option.data = result;
-
+                            debugger
+                           
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                             laypage.render(optionPage);
+                            debugger
+
                             ins = table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
                             Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 2cc0e4a..417308b 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -366,6 +366,7 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var HMainSourceBillNo = params[params[3]];
         }
 
         layui.config({
@@ -414,6 +415,9 @@
             }
             else if (OperationType == 3) {//缂栬緫
                 set_EditFromGrid();
+            }
+            else if (OperationType == 4) {//涓嬫帹
+                setInit_PushBill();
             }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -1234,6 +1238,57 @@
                 }
             }
 
+            //#region 涓嬫帹椤甸潰鍒濆鍖�
+            function setInit_PushBill() {
+                //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+                get_MAXNum();
+                $("#HEmpID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜篒D
+                $("#HEmpName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭缁翠慨浜�
+                $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+                $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
+                $("#HManagerID").val(sessionStorage["HEmpID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜篒D
+                $("#HManagerName").val(sessionStorage["HEmpName"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭璐熻矗浜�
+                $("#HMainSourceBillType").val() == "璁惧缁翠慨鐧昏鍗�";
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $("#HMainSourceBillNo").val(HMainSourceBillNo);
+                document.getElementById('HMainSourceBillNo').style.backgroundColor = '#efefef4d';
+                  //鎸夐�夊崟鍙峰姞杞借〃浣撴暟鎹�
+                $.ajax({
+                    url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpRepairWorkBillSubByHMainSourceBillNo',
+                    type: "GET",
+                    data: { "HMainSourceBillNo": HMainSourceBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var EndData = result.data;
+
+                            $("#HMainSourceInterID").val(EndData[0].hmainid);
+                            $("#HMainSourceEntryID").val(EndData[0].hsubid);
+                            // 鍥炲~璁惧淇℃伅
+                            $("#HEquipName").val(EndData[0].璁惧鍚嶇О);
+                            $("#HEquipID").val(EndData[0].HEquipID);
+
+                          
+                            if (EndData && EndData.length > 0) {
+                                // 缁翠慨淇℃伅琛ㄦ牸
+                                option.data = EndData; // 浣跨敤鑾峰彇鐨勬暟鎹�
+                                table.render(option);
+
+                                
+                                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" }];
+                                
+                                table.render(option1);
+                            }
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
             // 琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�1 閰嶄欢
             function set_GridCellCheck1(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
index c565ebe..667289a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpConkBookBillList.html"
@@ -173,6 +173,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushQualityReportBill" id="btn-PushQualityReportBill"><i class="layui-icon layui-icon-delete"></i>涓嬫帹</button>
                             </div>
                         </script>
                     </form>
@@ -435,6 +436,8 @@
                         break;
                     //璇诲彇鏂规
                     case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    case 'btn-PushQualityReportBill': set_PushQualityReportBill();
                         break;
                 };
             });
@@ -1117,6 +1120,38 @@
                 }
 
             }
+            //#region 涓嬫帹
+            function set_PushQualityReportBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    // var HEntryID = data[0].hsubid.toString();
+                    var HMainSourceBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嬫帹'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html?OperationType=4&linterid=' + hID + '&HSouceBillType=' + 1 + '&HMainSourceBillNo=' + HMainSourceBillNo
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            $("#btnSearch").trigger('click');
+                        }
+                        , cancel: function () {
+
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
 
             //璇诲彇鏂规
             function set_ReadScheme() {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index 4cee14f..e4a829e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../layuiadmin/PageTitle.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -274,7 +275,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo1">
@@ -282,7 +283,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></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>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -344,6 +345,8 @@
             //鏌ヨ鏉′欢
             var option = [];//淇濆吇
             var option1 = [];//閰嶄欢
+            var HModName = "Sb_EquipMaintainRuleListSub1";
+            var HModName1 = "Sb_EquipMaintainRuleListSub2";
             var sBillType = "3901";
             //var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
             //var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢
@@ -397,6 +400,11 @@
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage["HUserName"], option, table, function () {
+                        table.render(option)
+                    });
+                        break;
                 }
             });
             //澶村伐鍏锋爮浜嬩欢
@@ -410,6 +418,11 @@
                         break;
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine1': btnCopyLine1(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn1': get_HideColumnEditWithCallback(HModName1, sessionStorage["HUserName"], option1, table, function () {
+                        table.render(option1)
+                    });
                         break;
                 }
             });
@@ -705,7 +718,8 @@
                                 var PJData = result.data[1];//閰嶄欢
                                 var rowdate1 = layui.table.cache["mainTable"];
                                 var rowdate2 = layui.table.cache["mainTable1"];
-                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
+
+                                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": $("#HEquipID").val(), "HMaintainItem": $("#HEquipName").val(), "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " }];
                                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y" }];
                                 table.render(option);
                                 table.render(option1);
@@ -889,12 +903,12 @@
                 laydate.render({
                     elem: '#HDate',
                 });
-                laydate.render({
-                    elem: '#HBeginDate'
-                });
-                laydate.render({
-                    elem: '#HEndDate'
-                });
+                //laydate.render({
+                //    elem: '#HBeginDate'
+                //});
+                //laydate.render({
+                //    elem: '#HEndDate'
+                //});
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -906,7 +920,7 @@
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: "background:#ceedfa;color:black" }
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', hide: true, edit: 'text' }
                     , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: 'HMaintainItemNumber' }
@@ -938,7 +952,7 @@
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: "background:#ceedfa;color:black" }
                     , { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
                     , { field: 'HMaterNumber', title: '閰嶄欢浠g爜', edit: 'text', event: "HMaterCode" }
                     , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text', event: "" }
@@ -972,7 +986,9 @@
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
-                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
+                var ID = $("#HEquipID").val();
+                var Name = $("#HEquipName").val()
+                option.data = [{ "HMaintainItemID": 0, "HMaintainItemNumber": ID, "HMaintainItem": Name, "HMaintainPart": " ", "HClaim": " ", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": " " }];
                 option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HRemark": "", "HMaintainResult": "Y" }];
                 table.render(option);
                 table.render(option1);
@@ -1029,8 +1045,8 @@
                                 , "HEquipName": data.璁惧鍚嶇О
                                 , "HEquipID": data.璁惧ID              //璁惧
                                 , "HExplanation": data.鎽樿               //鎽樿
-                                , "HBeginDate": data.寮�濮嬫棩鏈�                //
-                                , "HEndDate": data.缁撴潫鏃ユ湡                //
+                                , "HBeginDate": data.寮�濮嬫棩鏈� == null ? "" : Format(new Date(data.寮�濮嬫棩鏈�), "yyyy-MM-dd")           //
+                                , "HEndDate": data.缁撴潫鏃ユ湡 == null ? "" : Format(new Date(data.缁撴潫鏃ユ湡), "yyyy-MM-dd")                  //
                                 , "HPlanName": data.淇濆吇璁″垝
                                 , "HPlanNo": data.淇濆吇璁″垝缂栧彿                //
                                 , "HPlanName": data.淇濆吇璁″垝缂栧彿                //
@@ -1754,6 +1770,33 @@
                 });
             })
         }
+
+        //淇濆吇绾у埆
+        function GetMaintainLevValue(obj) {
+            $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+            $("#HMaintainLevID").val(obj[0].HItemID);
+        }
+        function GetMaintainValue(obj) {
+            $("#HPlanName").val(obj[0].鍗曟嵁鍙�);
+            $("#HPlanNo").val(obj[0].鍗曟嵁鍙�);
+            $("#HEquipMaintainPlanInterID").val(obj[0].hmainid);
+            $("#HEquipName").val(obj[0].璁惧鍚嶇О);
+            $("#HEquipID").val(obj[0].HEquipID);
+            $("#HEquipMaintainRuleInterID").val(obj[0].HMouldMaintainRuleID);
+            $("#HEquipMaintainRuleInterNo").val(obj[0].淇濆吇瑙勭▼);
+            $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+            $("#HMaintainLevID").val(obj[0].HMaintainLevID);
+
+
+            $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
+            $("#HMainSourceInterID").val(obj[0].hmainid);
+            $("#HMainSourceEntryID").val(0);
+
+          
+        }
+
+
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 0bbe68f..80c8897 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -346,6 +346,30 @@
                 }
 
             });
+
+
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var linterid = data.hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                }
+            });
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -601,6 +625,7 @@
                                 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
@@ -657,7 +682,7 @@
                     }
                 })
             }
-
+           
             //#region 鍒嗛〉鏌ヨ
             function get_DisplayPage(sWhere) {
                 var ajaxLoad = layer.load();
@@ -688,11 +713,18 @@
                                 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: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 160 });
                                             break;
                                         case 'Decimal':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -1024,7 +1056,7 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * (HInitTimeCycle+1)), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index c7ca50d..55d96b1 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -255,7 +255,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="toolbarDemo1">
@@ -263,7 +263,7 @@
 
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -298,8 +298,9 @@
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
             var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
-        }
 
+        }
+        var OptionData = [];
 
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -319,6 +320,7 @@
             var option1 = [];//閰嶄欢
             var option_plan = [];//璁″垝
             var sBillType = "3902";
+            var HModName = "Sb_EquipMaintainPlanBillEdit";
             //var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
             //var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "", "HRemark": "" };//閰嶄欢
             //#endregion
@@ -378,6 +380,10 @@
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine': btnCopyLine(data);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(0);
+                        break;
                 }
             });
 
@@ -393,6 +399,29 @@
                     //澶嶅埗涓�琛�
                     case 'btn-CopyLine1': btnCopyLine1(data);
                         break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(1);
+                        break;
+                }
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable_plan)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable_plan')
+                    , data = checkStatus.data;
+                var NewRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HQty": "0", "HRemark": "" };
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine1': btnAddLine1(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine1': btnCopyLine1(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(2);
+                        break;
                 }
             });
             //琛屽唴浜嬩欢
@@ -405,6 +434,12 @@
                 set_GridDelete1(obj);   //琛屽唴鍒犻櫎
                 set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
             });
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable_plan)', function (obj) {
+                set_GridDelete1(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
             //琛ㄥご淇℃伅璁惧寮圭獥
             form.on('submit(HEquipList)', function () {
                 //椤甸潰灞�-鑷畾涔�
@@ -643,15 +678,16 @@
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , {
+                        templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: 'background-color: #f0f9ff;' }
                     , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
                     , { field: 'HMaintainItemNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainItemNumber' }
-                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰' }
+                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰',style: 'background-color: #f0f9ff;'  }
                     , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
                     , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
-                    , { field: 'HManagerName', title: '璐熻矗浜�' }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', style: 'background-color: #f0f9ff;'  }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
@@ -669,13 +705,14 @@
 
                     }
                 };
+
             }
             //鍒濆鍖栭厤浠堕」鍒楄〃
             function Table1() {
                 //琛ㄥご
                 columns = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: 'background-color: #f0f9ff;'  }
                     , { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
                     , { field: 'HMaterNumber', title: '閰嶄欢浠g爜', edit: 'text', event: "HMaterCode" }
                     , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text', event: "" }
@@ -709,14 +746,14 @@
                 //鐐规璁″垝
                 columns_plan = [
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe" }
-                    , { field: 'HPlanDate', title: '璁″垝鏃ユ湡' }
-                    , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣' }
-                    , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�' }
-                    , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�' }
-                    , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
-                    , { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
-                    , { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, event: "qwe", style: 'background-color: #f0f9ff;' }
+                    , { field: 'HPlanDate', title: '璁″垝鏃ユ湡', style: 'background-color: #f0f9ff;'  }
+                    , { field: 'HPlanBeginTime', title: '璁″垝寮�濮嬫椂闂寸偣', style: 'background-color: #f0f9ff;'  }
+                    , { field: 'HPlanEndTime', title: '璁″垝缁撴潫鏃堕棿鐐�', style: 'background-color: #f0f9ff;'  }
+                    , { field: 'HSafeEndTime', title: '瀹夊叏缁撴潫鏃堕棿鐐�', style: 'background-color: #f0f9ff;'  }
+                    , { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣', style: 'background-color: #f0f9ff;' }
+                    , { field: 'HRelationFlag', title: '鍏宠仈鏍囪', style: 'background-color: #f0f9ff;'  }
+                    , { field: 'DiffDate', title: '鐩稿樊闂撮殧', style: 'background-color: #f0f9ff;'  }
                 ];
                 option_plan = {
                     id: 'mainTable_plan'
@@ -1137,6 +1174,15 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
+                                    if (OptionData) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            HMaintainItemID: OptionData.HItemID,
+                                            HMaintainItemNumber: OptionData.淇濆吇椤圭洰浠g爜,
+                                            HMaintainItem: OptionData.淇濆吇椤圭洰鍚嶇О,
+                                        });
+                                        OptionData = [];
+                                    }
                                 }
                             });
                         }
@@ -1176,7 +1222,15 @@
                                     //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                                 },
                                 end: function () {
-
+                                    if (OptionData) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            HManagerID: OptionData[0].HItemID,
+                                            HManagerNumber: OptionData[0].鑱屽憳浠g爜,
+                                            HManagerName: OptionData[0].鑱屽憳鍚嶇О
+                                        });
+                                        OptionData = [];
+                                    }
                                 }
                             });
                         }
@@ -1273,7 +1327,7 @@
                                 shift: 2,
                                 area: ['90%', '90%'],
                                 maxmin: true,
-                                content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+                                content: ['../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?Type=HEmp', 'yes'],
                                 btn: ['纭畾', '鍙栨秷']
                                 , btn1: function (index, layero) {
 
@@ -1341,38 +1395,207 @@
 
                     }
                 }
-                //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
-                //    layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //    return false;
-                //}
-                //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
-                //    sSubStr1 = JSON.parse(sSubStr1);
-                //    for (var i = 0; i < sSubStr1.length; i++) {
-                //        if (sSubStr1[i].HMaterNumber == "") {
-                //            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //            return false;
-                //        }
-                //        if (sSubStr1[i].HUnitNumber == "") {
-                //            layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //            return false;
-                //        }
-                //        if (sSubStr[i].HManagerNumber == "") {
-                //            layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                //            return false;
-                //        }
-                //    }
-                //}
+                
                 else {
+
                     return Result = true;
                 }
+              
                 return Result;
             }
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
             }
+
+
+            //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+            function get_HideColumn(num) {
+                var colName = "";
+                var contentUrl = "";
+                if (num == 0) {
+                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                        colName += option.cols[0][i]["title"] + ",";
+                    }
+                }
+                if (num == 1) {
+                    for (var i = 1; i < option1.cols[0].length - 1; i++) {
+                        colName += option1.cols[0][i]["title"] + ",";
+                    }
+                }
+                if (num == 2) {
+                    for (var i = 1; i < option_plan.cols[0].length - 1; i++) {
+                        colName += option_plan.cols[0][i]["title"] + ",";
+                    }
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn(num);
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
             //#endregion
 
+
+            //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+            function DisPlay_HideColumn(num) {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HQCCheckItemID", "HInspectInstruMentID"];
+
+                            dataCol = data1.data[0].HGridString.split(',');
+                            var currentOption;
+                            if (num == 0) {
+                                currentOption = option;
+                            } else if (num == 1) {
+                                currentOption = option1;
+                            } else if (num == 2) {
+                                currentOption = option_plan;
+                            }
+                            for (var i = 0; i < currentOption.cols[0].length - 2; i++) {
+                                if (dataCol.length <= i) {
+                                    break;
+                                }
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    currentOption.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    currentOption.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    currentOption.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    currentOption.cols[0][i + 1]["style"] += "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(currentOption.cols[0][i + 1]["title"], titleData) == -1) {
+                                    currentOption.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        currentOption.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        currentOption.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        currentOption.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    currentOption.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < currentOption.cols[0].length - 1; i++) {
+                                if (currentOption.cols[0][i]["fixed"] != null) {
+                                    currentOption.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(currentOption.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    currentOption.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(currentOption);
+                        } else {
+                            if (num == 0) {
+                                table.render(option);
+                            } else if (num == 1) {
+                                table.render(option1);
+                            } else if (num == 2) {
+                                table.render(option_plan);
+                            }
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+           
+
+
         });
+        //淇濆吇绾у埆
+        function GetEquipMaintainRuleListValue(obj) {
+            //$("#HMouldMaintainRuleID").val(obj[0].hmainid);
+            var se=$("#HMaintainLevID").val();
+            $("#HMaintainLevID").val(obj.HMaintainLevID);
+            $("#HMouldMaintainRuleNo").val(obj.鍗曟嵁鍙�);
+            $("#HCheckCycle").val(obj.淇濆吇鍛ㄦ湡);
+        }
+
+        function GetEquipFileValue(obj) {  //杩斿洖璁惧
+            $("#HEquipID").val(obj[0].hmainid);//id
+            //$("#HEquipNumber").val(obj[0].璁惧浠g爜);//璁惧浠g爜
+            $("#HEquipName").val(obj[0].璁惧鍚嶇О);//璁惧鍚嶇О
+            //$("#HEquipModel").val(obj[0].璁惧瑙勬牸);//璁惧鍨嬪彿
+        }
+        //淇濆吇绾у埆
+        function GetMaintainLevValue(obj) {
+            $("#HMaintainLevName").val(obj[0].淇濆吇绾у埆鍚嶇О);
+            $("#HMaintainLevID").val(obj[0].HItemID);
+        }
+
+        function GetHDeptNameValue(obj)  //杩斿洖閲囪喘閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+
+        //淇濆吇椤圭洰
+        function GetMaintainListValue(obj) {
+            //option.data.淇濆吇椤圭洰浠g爜 = obj.淇濆吇椤圭洰浠g爜
+           // option[0].淇濆吇椤圭洰 = obj.淇濆吇椤圭洰鍚嶇О
+            //option[0].HItemID = obj.HItemID
+            OptionData = obj;
+           
+        }
+        function GetHManagerValue(obj) {
+            OptionData = obj;
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index f608959..1826da2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -95,10 +95,10 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
+                                                <!--<option value="<=">
                                                     <=< /option>
                                                 <option value="<">
-                                                    << /option>
+                                                    << /option>-->
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -129,10 +129,10 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
+                                                <!--<option value="<=">
                                                     <=< /option>
                                                 <option value="<">
-                                                    << /option>
+                                                    << /option>-->
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -163,10 +163,10 @@
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
                                                 <option value=">">></option>
-                                                <option value="<=">
+                                                <!--<option value="<=">
                                                     <=< /option>
                                                 <option value="<">
-                                                    << /option>
+                                                    << /option>-->
                                                 <option value="<>">
                                                     <>
                                                 </option>
@@ -256,6 +256,7 @@
                 , util = layui.util
                 , soulTable = layui.soulTable
             //鏌ヨ鏉′欢
+            var IsAut = 0;
             var sWhere = "";
             var option = [];
             var option1 = [];
@@ -298,6 +299,17 @@
             //鍒濆鍖栫晫闈�
             set_ClearBill();
             //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                var index = parent.layer.getFrameIndex(window.name);
+                //杩斿洖鏂规硶
+                parent.GetMaintainValue(data);
+                parent.layer.close(index);
+
+            });
 
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -966,6 +978,7 @@
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
+                var quu = IsAut;
                 if (checkStatus.data.length === 1) {
                     var linterid = data[0].hmainid.toString();
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
@@ -976,7 +989,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' + quu
                         , resize: false,
                         end: function () {
                             //鍒锋柊椤甸潰,
@@ -1008,6 +1021,7 @@
                             success: function (result) {
                                 if (result.count == 1) {
                                     get_FastQuery();
+                                    IsAut = 1;
                                     layer.msg(result.Message, { icon: 1 });
                                     layer.close(wait);
                                 } else {
@@ -1126,8 +1140,8 @@
 
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
-                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
-                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29,180,365];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];
 
                 var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
                 for (var i = 0; i < valueList.length; i++) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
index dfcf62c..8507d2d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
@@ -204,7 +204,7 @@
             //#endregion
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID", "宸ヨ壓鍙傛暟"];
+            var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭", "鍚屾鏍囪"];
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -431,22 +431,18 @@
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];
-                            var col = [];
-                            var totalArray = ["鏁伴噺"];
+                            var col = [];                           
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
-                            for (var i = 0; i < data.length; i++) {
-                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            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 ($.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 == '鍗曟嵁鍙�') {
+                                else if (data[i].name == '鍗曟嵁鍙�') {
                                     col.push({
                                         field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
                                             return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
@@ -521,36 +517,7 @@
                     }
                 });
             }
-
-            //鑾峰彇鍒楀
-            function getColumnsWidth() {
-                var result = [];
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                //鑾峰彇鍒楀
-                $.ajax({
-                    url: GetWEBURL() + '/Cg_POOrderBill/list',
-                    async: false,
-                    type: "Get",
-                    dataType: "json",
-                    data: { "colNum": colNum, "Name": Name },
-                    success: function (data1) {
-                        if (data1.code == 1) {
-                            result = data1.data;
-                        }
-                        else if (data1.code == -1) {
-
-                        }
-                        else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-
-                return result;
-            }
-
+         
             //蹇�熻繃婊�
             function get_FastQuery(table, option,number) {
                 var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
@@ -646,8 +613,9 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
                 }
                 sWhere += addSWhereByOpenType();
-                //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
-                //sWhere += " and HUserID =" + sessionStorage["Czybm"]
+
+                sWhere += "     order by  鏃ユ湡  desc";
+
                 var index = layer.load(0);
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -713,7 +681,7 @@
                 $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                 form.render('select');
 
-                $("#HInitTimeCycle").val("2");
+                $("#HInitTimeCycle").val("4");
             }
             //#endregion
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
index 661d019..075e059 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
@@ -205,7 +205,7 @@
             //#endregion
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID", "宸ヨ壓鍙傛暟"];
+            var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭","鍚屾鏍囪"];
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -398,22 +398,18 @@
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];
-                            var col = [];
-                            var totalArray = ["鏁伴噺"];
+                            var col = [];                           
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
-                            for (var i = 0; i < data.length; i++) {
-                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            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 ($.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 == '鍗曟嵁鍙�') {
+                                else if (data[i].name == '鍗曟嵁鍙�') {
                                     col.push({
                                         field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
                                             return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
@@ -469,35 +465,7 @@
                 });
             }
 
-            //鑾峰彇鍒楀
-            function getColumnsWidth() {
-                var result = [];
-                var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
-                //鑾峰彇鍒楀
-                $.ajax({
-                    url: GetWEBURL() + '/Cg_POOrderBill/list',
-                    async: false,
-                    type: "Get",
-                    dataType: "json",
-                    data: { "colNum": colNum, "Name": Name },
-                    success: function (data1) {
-                        if (data1.code == 1) {
-                            result = data1.data;
-                        }
-                        else if (data1.code == -1) {
-
-                        }
-                        else {
-                            layer.alert(data1.Message, { icon: 5 });
-                        }
-                    }, error: function (e) {
-                        layer.alert(e.Message, { icon: 5 });
-                    }
-                });
-
-                return result;
-            }
-
+          
             //蹇�熻繃婊�
             function get_FastQuery(table, option,number) {
                 var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
@@ -593,8 +561,8 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
                 }
                 sWhere += addSWhereByOpenType();
-                //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
-                //sWhere += " and HUserID =" + sessionStorage["Czybm"]
+
+                sWhere += "     order by  鏃ユ湡  desc";
                 var index = layer.load(0);
                 get_Display(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -661,7 +629,7 @@
                 $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                 form.render('select');
 
-                $("#HInitTimeCycle").val("2");
+                $("#HInitTimeCycle").val("0");
             }
             //#endregion
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList_v2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList_v2.html"
index 2ac85da..eeb53db 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList_v2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBillList_v2.html"
@@ -62,113 +62,115 @@
                                 <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 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"
+                                <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                    id="HFilterScheme_Now">
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-inline" style="margin-left:5px;">
+                                        <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>
-                                        <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:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1"
-                                                    style="width:190px;">
-                                                </select>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input" value="" name="ColContent"
+                                                    id="ColContent">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" 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" value="" name="ColContent1"
-                                                id="ColContent1">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2"
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" lay-filter="ColName1"
+                                                        style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" 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" value="" name="ColContent1"
+                                                    id="ColContent1">
+                                            </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" 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 class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" lay-filter="ColName2"
+                                                        style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" 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" value="" name="ColContent2"
+                                                    id="ColContent2">
+                                            </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2"
-                                                id="ColContent2">
-                                        </div>
-                                    </div>
 
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -180,8 +182,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" 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" 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" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -249,12 +255,28 @@
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
-                    ////瀹℃牳鎸夐挳
-                    //case 'btn-Audit': set_CheckBill();
-                    //    break;
-                    ////鍙嶅鏍告寜閽�
-                    //case 'btn-DeAudit': set_AbandonCheck();
-                    //    break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_CheckBill(1);
+                        break;
+                     //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
                     ////棰勮鎸夐挳
                     //case 'get_PrintReport': get_PrintReport();
                     //    break;
@@ -574,6 +596,114 @@
             }
             //#endregion
 
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(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() + "/QC_LastPieceCheck_ValueTable/QC_LastPieceCheckValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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_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() + "/QC_LastPieceCheck_ValueTable/CloseQC_LastPieceCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫浣滃簾鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_LastPieceCheck_ValueTable/DropQC_LastPieceCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
index 419c460..9bab4c8 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\344\272\247\345\223\201\345\205\245\345\272\223\346\243\200\351\252\214\345\215\225/QC_LastPieceCheckBill_v2.html"
@@ -46,6 +46,10 @@
             margin-left: -15px;
             margin-right: -15px;
         }
+
+        .zy-hidden {
+            display: none;
+        }
     </style>
 </head>
 
@@ -125,7 +129,7 @@
                                                     value="1">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -141,7 +145,7 @@
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -158,7 +162,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row zy-hidden">
                                         <div class="layui-inline">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index b9877df..61762fb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -36,6 +36,10 @@
             margin-left: -15px;
             margin-right: -15px;
         }
+
+        .zy-hidden {
+            display: none;
+        }
     </style>
 </head>
 
@@ -46,10 +50,14 @@
                 <form class="layui-form" lay-filter="formData" 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="Saver">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
-                                lay-filter="Exit">閫�鍑�</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit=""
+                                lay-filter="btn-AddNew" id="btn-AddNew">鏂板</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSave"
+                                id="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit=""
+                                lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btn-Exit"
+                                id="btn-Exit">閫�鍑�</button>
                         </div>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -106,7 +114,7 @@
                                                     value="1">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -122,7 +130,7 @@
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -139,7 +147,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row zy-hidden">
                                         <div class="layui-inline">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
@@ -888,6 +896,7 @@
             else if (OperationType == 2) {
                 $("#HInterID").val("");
                 $("#HBillNo").val("");
+                $("#btn-AddNew").addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鏂板鎸夐挳绂佺敤
                 $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂鐢熶骇璧勬簮鎸夐挳绂佺敤
                 $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浠诲姟鍗曞彿鎸夐挳绂佺敤
                 $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//鏈夋簮鍗曟椂浜у搧鍐呯爜鎸夐挳绂佺敤
@@ -946,20 +955,30 @@
             //#region 琛ㄥご寮规閫夋嫨
 
             //淇濆瓨
-            form.on('submit(Saver)', function (data) {
+            form.on('submit(btnSave)', function (data) {
                 set_SaveBill(data);
             });
 
+            // 鏂板
+            form.on('submit(btn-AddNew)', function () {
+                set_AddBill();
+            });
+
+            // 瀹℃牳
+            form.on('submit(set_CheckBill)', function () {
+                set_CheckBill();
+            })
+
             //閫�鍑�
-            form.on('submit(Exit)', function (data) {
+            form.on('submit(btn-Exit)', function (data) {
                 if (OperationType == 1) {
-                    Pub_Close(1);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+                    Pub_Close(2);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
                 }
                 else if (OperationType == 3) {
                     Pub_Close(1);
                 }
                 else {
-                    Pub_Close(2);
+                    Pub_Close(1);
                 }
             });
 
@@ -3889,6 +3908,40 @@
             }
             //#endregion
 
+            function set_AddBill() {
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    location.replace('QC_OutCompCheckBill.html?OperationType=1&linterid=&HSouceBillType=0&closeType=2');
+                });
+            }
+
+            //#region 瀹℃牳鏁版嵁
+            function set_CheckBill() {
+                var InterID = $("#HInterID").val();
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/QC_OutCompCheckBill/CheckQC_OutCompCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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);
+                            });
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
             //缂栬緫鏌ョ湅
             function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
@@ -4084,6 +4137,8 @@
                             layer.close(index);
                             layer.msg("鎻愪氦鎴愬姛");
                             $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                            $('#set_CheckBill').removeClass("layui-btn-disabled").removeAttr("disabled").addClass("layui-btn-normal");
+                            
                         }
                         else {
                             layer.close(index);
@@ -4144,6 +4199,8 @@
 
         });
 
+
+
         //闈炵┖楠岃瘉    
         function GetHCusNameValue(obj) {  //瀹㈡埛
             $("#HCusName").val(obj[0].瀹㈡埛鍚嶇О);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
index 8c7ba21..06c68db 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckOtherBillList.html"
@@ -931,6 +931,20 @@
 
             //#region 瀵煎嚭Execel
             function btn_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, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
+                    }
+                });
+
                 table.exportFile(ins.config.id, option.data, "xls");
             }
             //#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index f3960f6..1111bf9 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -301,8 +301,8 @@
                     <div class="layui-tab layui-tab-card">
                         <ul class="layui-tab-title">
                             <li class="layui-this">妫�楠岄」鐩�</li>
-                            <li>鎶芥牱妫�楠�</li>
-                            <li>妫�娴嬪��</li>
+                            <!--<li>鎶芥牱妫�楠�</li>
+                            <li>妫�娴嬪��</li>-->
                         </ul>
                         <div class="layui-tab-content">
                             <div class="layui-tab-item layui-show">
@@ -829,17 +829,27 @@
                             $("#HMaker").val(sessionStorage["HUserName"]);
                         }
                     });
+                    //鎶ュ伐骞冲彴鏈欢
                     if (HSouceBillType == 3722 || HSouceBillType == 4610) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation2();
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
-                    } else if (HSouceBillType == 3791) {
+                    }
+                     //宸ュ簭鍑虹珯鍗曞垪琛� 鏈欢
+                    else if (HSouceBillType == 3791) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation_StationOutBill();
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }//鐢熶骇璁㈠崟鍒楄〃鏈
+                    else if (HSouceBillType == 3710) {
+                        //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                        LoadingInformation_ICMO();
+                        //鑷姩甯﹀嚭妫�楠屾柟妗�
+                        GetCheckItemID();
+                    }
+                    //鐢熶骇璁㈠崟鍒楄〃鏈
                     else if (HSouceBillType == 3710) {
                         //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                         LoadingInformation_ICMO();
@@ -956,6 +966,42 @@
                 });
             }
 
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅--鐢熶骇璁㈠崟
+            function LoadingInformation_ICMO() {
+                $("#hidediv1").attr({ "style": "display:none" });
+                $("#hidediv2").attr({ "style": "display:none" });
+
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": "and hmainid = " + linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HICMOBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOQty").val(data.鐢熶骇浠诲姟鍗曟暟閲�);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.鍗曟嵁绫诲瀷);
+                            $("#HMainSourceInterID").val(data.hmainid);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
             //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(宸ュ簭娴佽浆鍗�)
             function LoadingInformation_ProcExchange() {
                 $('#btnSearchSource').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熶骇璧勬簮鎸夐挳鍚敤
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
index e6fdb85..b332c42 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList2.html"
@@ -883,6 +883,9 @@
                         if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                             item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
                         }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
                     }
                 });
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
index fa225ec..5fe5a88 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBill.html"
@@ -44,6 +44,7 @@
                 <form class="layui-form" lay-filter="component-form-group" action="">
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
+                            
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                         </div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
index 8b6b319..a099f85 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_Add_Edit_POStockInCheckBillList.html"
@@ -46,6 +46,10 @@
             margin-left: -15px;
             margin-right: -15px;
         }
+
+        .zy-hidden {
+            display: none;
+        }
     </style>
 </head>
 
@@ -126,7 +130,7 @@
                                                     value="1">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -142,7 +146,7 @@
                                                 <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline zy-hidden">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">鐢熶骇鐝</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
@@ -159,7 +163,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
+                                    <div class="layui-row zy-hidden">
                                         <div class="layui-inline">
                                             <label class="layui-form-label"
                                                 style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿</label>
@@ -976,6 +980,8 @@
 
                 $("#HFirstCheckEmp").val(sessionStorage["HEmpID"]);
                 $("#HFirstCheckEmpName").val(sessionStorage["HEmpName"]);
+
+                $("#HMainSourceBillType").attr('disabled', 'disabled');
                 HDeptID = sessionStorage["HDeptID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
                 HCenterID = sessionStorage["HWorkCenterID"]; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭宸ヤ綔涓績ID
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -1011,6 +1017,8 @@
                 }
                 //鑾峰彇鐝
                 get_HWorkShift();
+
+                form.render('select')
             }
             else if (OperationType == 3) {
                 RoadBillMain(linterid);
@@ -1439,7 +1447,15 @@
 
             //閫�鍑�
             function get_Exit() {
-                Pub_Close(1);
+                if (OperationType == 1) {
+                    Pub_Close(2);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+                }
+                else if (OperationType == 3) {
+                    Pub_Close(1);
+                }
+                else {
+                    Pub_Close(1);
+                }
             }
 
             //琛屽唴浜嬩欢--妫�楠岄」鐩�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
index 9e33486..ba41881 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\235\245\346\226\231\346\243\200\351\252\214\345\215\225/QC_POStockInCheckBillList.html"
@@ -62,113 +62,114 @@
                                 <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 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"
+                                <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                    id="HFilterScheme_Now">
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-inline" style="margin-left:5px;">
+                                        <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>
-                                        <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:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1"
-                                                    style="width:190px;">
-                                                </select>
+                                            <div class="layui-inline">
+                                                <input type="text" class="layui-input" value="" name="ColContent"
+                                                    id="ColContent">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" 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" value="" name="ColContent1"
-                                                id="ColContent1">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-top:5px">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">杩囨护</label>
-                                            <div class="layui-input-block">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2"
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName1" id="ColName1" lay-filter="ColName1"
+                                                        style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator1" id="Comparator1" 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" value="" name="ColContent1"
+                                                    id="ColContent1">
+                                            </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" 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" value="" name="ColContent2"
-                                                id="ColContent2">
+                                        <div class="layui-row" style="margin-top:5px">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">杩囨护</label>
+                                                <div class="layui-input-block">
+                                                    <select name="ColName2" id="ColName2" lay-filter="ColName2"
+                                                        style="width:190px;">
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <select name="Comparator2" id="Comparator2" 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" value="" name="ColContent2"
+                                                    id="ColContent2">
+                                            </div>
                                         </div>
                                     </div>
-
                                 </div>
                             </div>
                         </div>
@@ -180,8 +181,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" 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" 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" 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" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -249,15 +254,31 @@
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
                         break;
-                    ////瀹℃牳鎸夐挳
-                    //case 'btn-Audit': set_CheckBill();
-                    //    break;
-                    ////鍙嶅鏍告寜閽�
-                    //case 'btn-DeAudit': set_AbandonCheck();
-                    //    break;
-                    ////棰勮鎸夐挳
-                    //case 'get_PrintReport': get_PrintReport();
-                    //    break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_CheckBill(1);
+                        break;
+                    //棰勮鎸夐挳
+                    // case 'get_PrintReport': get_PrintReport();
+                    //   break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(2);
+                        break;
                     //閫�鍑烘寜閽�
                     case 'get_Exit': Pub_Close(2);
                         break;
@@ -839,6 +860,114 @@
             //}
             ////#endregion
 
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(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() + "/QC_POStockInCheck_ValueTable/QC_POStockInCheckValue", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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_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() + "/QC_POStockInCheck_ValueTable/CloseQC_POStockInCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫浣滃簾鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/QC_POStockInCheck_ValueTable/DropQC_POStockInCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
index 8e1dc37..dc19f1d 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList2.html"
@@ -930,6 +930,9 @@
                         if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                             item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
                         }
+                        if (itemobj === '瑙勬牸鍨嬪彿') {
+                            item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                        }
                     }
                 });
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
index 46774dd..63ed928 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_BarcodeWhiteLabelReport.html"
@@ -104,10 +104,10 @@
                 var HWhiteBardcode = $("#HWhiteBardcode").val();
 
                 if (HBarcode != "") {
-                    sWhere += " and 鏉$爜 like'%" + HBarcode+"%'";
+                    sWhere += " and 鏉$爜 like'%" + HBarcode +"%'";
                 }
                 if (HWhiteBardcode != "") {
-                    sWhere += " and 鐧芥爣 ='" + HWhiteBardcode+"'";
+                    sWhere += " and 鐧芥爣 like'%" + HWhiteBardcode + "%'";
                 }
 
                 sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
index d7a1eb6..d8d09d9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackagingList.html"
@@ -525,69 +525,7 @@
                 //鏍囨敞閫変腑鏍峰紡
                 obj.tr.addClass('layui-table-click').siblings().removeClass('layui-table-click');
             });
-
-            //#region 鎵撳嵃
-            //form.on('submit(Print)', function (obj) {//閫�鍑�
-            //    var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
-            //    var linterid = checkStatus.data[0].HInterID;
-            //    ////鎵撳紑鎵撳嵃妯℃澘
-            //    ////var linterid = $("#HInterID").val();
-            //    ////var linterid = "28973";
-            //    //var Type = "HBarCodePrint";
-            //    //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
-            //    ////var ReportViewer = document.getElementById("ReportViewer");
-            //    //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
-
-
-            //    var sWhere = "select  a.HBarCode_White HBarCode_White,temp.HSupPartName HSupPartName,temp.HSupBarCodeNumber MFGPartNumber,temp.HCountryType CountryofOrigin,(select REPLACE(item, 'Q', '') from split(a.HBarCode_White, ':') where id = 6) Quantity, temp.HGrossWeight GrossWeight, temp.HPARTNAME PartName , (select item from split(a.HBarCode_White, ':') where id = 2) ContentLabelID , temp.HSupNumber Supplier, REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') + ' ' + convert(varchar(5), GETDATE(), 24) MFGDate , REPLACE(convert(varchar(10), GETDATE(), 20), '-', '') SupplierLotCode , (select REPLACE(item, 'P', '') from split(a.HBarCode_White, ':') where id = 4) BBM   from Sc_PackUnionBillMain a left join  Gy_Material m on a.HMaterID = m.HItemID left join Sc_PackUnionBillBarCode_temp temp on m.HNumber = temp.HMaterNumber where a.HInterID=" + linterid;
-
-            //    $.ajax({
-            //        type: "GET",
-            //        url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-            //        async: true,
-            //        data: { "sWhere": sWhere },
-            //        success: function (data) {
-            //            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
-            //                if (data.data.length != 0) {
-            //                    var dataPrint = [];
-            //                    dataPrint.push(data.data[0]
-            //                        //{ "浜у搧鍚嶇О": data.data[0]["浜у搧鍚嶇О"], "鏉$爜缂栧彿": data.data[0]["鏉$爜缂栧彿"], "鏁伴噺": data.data[0]["鏁伴噺"], "鏃ユ湡": data.data[0]["鏃ユ湡"], "鐢熶骇浠诲姟鍗�": data.data[0]["鐢熶骇浠诲姟鍗�"], "娴佽浆鍗$紪鍙�": data.data[0]["娴佽浆鍗$紪鍙�"], "鑷畾涔夊瓧娈�": data.data[0]["鑷畾涔夊瓧娈�"], "椤圭洰缂栧彿": data.data[0]["椤圭洰缂栧彿"] }
-            //                    );
-
-            //                    var Customer = {
-            //                        "Table": dataPrint
-            //                    }
-
-            //                    var args = {
-            //                        type: "print",
-            //                        showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
-            //                        report: urlAddRandomNo("../../grf/鐧芥爣鎵撳嵃.grf"),
-            //                        data: Customer
-            //                    };
-            //                    //var args = {
-            //                    //    report: urlAddRandomNo("../../views/grf/鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�).grf"),
-            //                    //    data: Customer
-            //                    //};
-            //                    webapp_ws_ajax_run(args);
-            //                } else {
-            //                    layer.msg("鏌ユ棤鏁版嵁!");
-            //                }
-
-            //            }
-            //            else {
-            //                layer.msg(data.Message, { icon: 5 });
-            //            }
-            //            layer.closeAll("loading");
-            //        },
-            //        error: function (err) {
-            //            layer.msg("閿欒:" + err, { icon: 5 });
-            //        }
-            //    })
-
-            //});
-            //#endregion
-
+          
             //鐧芥爣鐢熸垚淇濆瓨
             form.on('submit(WhiteSave)', function (obj) {//閫�鍑�
                 var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
@@ -614,11 +552,17 @@
             form.on('submit(Print)', function (obj) {//閫�鍑�
                 var checkStatus = table.checkStatus("mainTable"); //鑾峰彇閫変腑琛岀姸鎬�
                 var linterid = checkStatus.data[0].HInterID;
-                var HOrgID = $("#HOrgID").val();
-                var Type = "HBarCodePrint";
-                var OpenTmp = "鐧芥爣鎵撳嵃15";
-                //var ReportViewer = document.getElementById("ReportViewer");
-                window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "|" + HOrgID +  "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
+                var HOrgID = $("#HOrgID").val();              
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鎵撳嵃妯$増閫夋嫨'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid='+ linterid.toString() + '|' + HOrgID +  '&MyMsg=&Type=' + HModName, 'yes']
+                    , resize: false
+                })             
             });
 
             //鎵撳嵃鎸夐挳  鏅彶鐗规墦鍗�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
index c91ee8b..32714ef 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging_MXG.html"
@@ -20,60 +20,71 @@
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
-            <!--<div class="layui-card-header"></div>-->
             <div class="layui-card-body" style="padding: 15px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div class="layui-form-item" style="margin-bottom: 20px;">
                         <button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">鏂板</button>
-                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">娓呯┖</button>-->
                         <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">淇濆瓨</button>
                         <button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">閫�鍑�</button>
+                        <button type="button" lay-submit="" lay-filter="HAddPrint" class="layui-btn layui-btn-radius">鏂板鎵撳嵃妯℃澘</button>
+
                         <div class="layui-inline">
-                            <div class="layui-input-block">
-                                <select name="city" lay-verify="required" id="dymb">
-                                    <!--<option value="鏈�夋嫨">璇烽�夋嫨鎵撳嵃妯℃澘</option>-->
-                                    <option value="HBarCodePrint">鐗╂枡鏉$爜妯℃澘</option>
-                                    <!--<option value="HPOInStockBill">閫佽揣鍗�</option>-->
-                                    <!--<option value="HPOInStockBill">閫佽揣鍗�(鏍囩绾�)</option>-->
+                            <label class="layui-form-label" style="width: 85px;">鎵撳嵃妯℃澘</label>
+                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                <select name="dymb" id="dymb" lay-verify="dymb" class="ForFilteringSchemes">
+                                    <!--鍔ㄦ�佹覆鏌撴ā鏉�-->
                                 </select>
                             </div>
                         </div>
                         <button type="button" lay-submit="" lay-filter="Print" id="Print" class="layui-btn layui-btn-radius">鎵撳嵃</button>
                         <button type="button" lay-submit="" lay-filter="Print2" id="Print2" hidden="hidden"></button>
-                        <div class="layui-inline" style="width: 200px;">
-                            <div class="layui-input-block">
-                                <select name="PrintName" lay-verify="required" id="PrintName">
-                                    <option value="澧ㄨタ鍝�" selected>澧ㄨタ鍝�</option>
-                                    <option value="鏂帿灏�">鏂帿灏�</option>
-                                    <option value="鏅彶鐗�">鏅彶鐗�</option>
-                                </select>
+                        
+                        <div class="layui-row" style="margin-top:20px">
+                            <div class="layui-inline" style="width: 200px;">
+                                <div class="layui-input-block">
+                                    <select name="PrintName" lay-verify="required" id="PrintName">
+                                        <option value="澧ㄨタ鍝�" selected>澧ㄨタ鍝�</option>
+                                        <option value="鏂帿灏�">鏂帿灏�</option>
+                                        <option value="鏅彶鐗�">鏅彶鐗�</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <div class="layui-input-block">
+                                    <select name="LDM" lay-verify="required" id="LDM">
+                                        <option value="HEJ" selected>HEJ</option>
+                                        <option value="DU3">DU3</option>
+                                        <option value="QDR">QDR</option>
+                                        <option value="AAA">15杞﹂棿</option>
+                                        <option value="鍏朵粬">鍏朵粬</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 85px;">闆堕儴浠跺彿</label>
+                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                    <select name="BBM" lay-verify="required" id="BBM">
+                                        <option value="1099081-00-E">1099081-00-E</option>
+                                        <option value="1786947-00-B">1786947-00-B</option>
+                                        <option value="1607222-00-B">1607222-00-B</option>
+                                        <option value="1943600-00-B">1943600-00-B</option>
+                                        <option value="1941600-00-B">1941600-00-B</option>
+                                        <option value="1941600-00-C">1941600-00-C</option>
+                                        <option value="1943600-00-C">1943600-00-C</option>
+                                        <option value="鍏朵粬" selected>鍏朵粬</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label>
+                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                    <select name="NBXMH" id="NBXMH" lay-verify="NBXMH" class="ForFilteringSchemes">
+                                        <!--鍔ㄦ�佹覆鏌撳唴閮ㄩ」鐩彿-->
+                                    </select>
+                                </div>
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <div class="layui-input-block">
-                                <select name="LDM" lay-verify="required" id="LDM">
-                                    <option value="HEJ" selected>HEJ</option>
-                                    <option value="DU3" >DU3</option>
-                                    <option value="QDR">QDR</option>
-                                    <option value="AAA">15杞﹂棿</option>
-                                    <option value="鍏朵粬">鍏朵粬</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <div class="layui-input-block">
-                                <select name="BBM" lay-verify="required" id="BBM">
-                                    <option value="1099081-00-E">1099081-00-E</option>
-                                    <option value="1786947-00-B">1786947-00-B</option>
-                                    <option value="1607222-00-B">1607222-00-B</option>
-                                    <option value="1943600-00-B">1943600-00-B</option>
-                                    <option value="1941600-00-B">1941600-00-B</option>
-                                    <option value="1941600-00-C">1941600-00-C</option>
-                                    <option value="1943600-00-C">1943600-00-C</option>
-                                    <option value="鍏朵粬" selected>鍏朵粬</option>
-                                </select>
-                            </div>
-                        </div>
+
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-row" style="padding:10px 0">
@@ -305,7 +316,7 @@
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
     <script src="../../CreateControl.js"></script>
     <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script>
@@ -349,41 +360,7 @@
             set_InitGrid();
             var HModName = "MES_ProductionLinePackaging_MXG";
             initFunction(1, HModName, sessionStorage["HTranSlate"]);
-            //鍒濆鍖栨槑缁嗚〃鏍�
-            function set_InitGrid() {
-                columns = [
-                    { type: 'numbers', title: '搴忓彿' }
-                    , {
-                        field: time, title: '鎵爜鏃ユ湡', width: 110, templet: function (d) {
-                            return util.toDateString(time, "yyyy-MM-dd");
-                        }
-                    }
-                    //, { field: 'HBarCode_Pack', title: '鏉″舰鐮�', width: 145 }
-                    , { field: 'HSourceBillNo', title: '鏉″舰鐮�', width: 145 }
-                    , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 125 }
-                    , { field: 'HBarCode', title: '鍞竴鐮�', width: 125 }
-                    , { field: 'HNumber', title: '鐗╂枡缂栫爜', width: 105 }
-                    , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 105 }
-                    , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 105 }
-                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
-                    //, { field: 'HWhID', title: '浠撳簱', width: 80 }
-                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 80 }
-                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 195 }
-                    , { toolbar: '#toolBar', width: 65, fixed: 'right' }
-                ];
-                option = {
-                    id: 'smjl-table'
-                    , elem: '#smjl-table'
-                    //, toolbar: '#toolbarDemo'
-                    , page: false
-                    //, cellMinWidth: 120
-                    //, height: 500
-                    , cols: [columns]
-                    //, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                    , done: function (res, curr, count) {
-                    }
-                };
-            }
+
             //鍏ㄥ眬鍙橀噺
             var ZJTMFlag = false;//瀛愪欢鏉$爜杈撳叆鏍囪
             //鑾峰彇褰撳墠鏃堕棿澶勭悊
@@ -400,12 +377,6 @@
             var pcmQtyFlag = 0;
             var icmoQty = 0;//娴佽浆鍗℃暟閲�
             var icmoQtyNow = 0;//娴佽浆鍗″墿浣欐暟閲�
-            //console.log(sessionStorage);
-
-            //椤甸潰鍒濆鍖栬祴鍊�
-            layer.load(3);
-            //鑾峰彇鍗曟嵁鍙�
-            getBillno();
 
             $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
             $("#zxQty").focus();
@@ -419,6 +390,45 @@
             $("#HFbarcode").css("background-color", "#efefef4d");
             $("#pcmQty").attr("readonly", "readonly");//鏁伴噺鍙
             $("#pcmQty").css("background-color", "#efefef4d");
+
+            //鑾峰彇鎵撳嵃妯℃澘
+            GetHBarCodePrint();
+            //鑾峰彇椤圭洰鍙�
+            GetHProject();
+
+            //鍒濆鍖栨槑缁嗚〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'numbers', title: '搴忓彿' }
+                    , {
+                        field: time, title: '鎵爜鏃ユ湡', width: 110, templet: function (d) {
+                            return util.toDateString(time, "yyyy-MM-dd");
+                        }
+                    }                   
+                    , { field: 'HSourceBillNo', title: '鏉″舰鐮�', width: 145 }
+                    , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 125 }
+                    , { field: 'HBarCode', title: '鍞竴鐮�', width: 125 }
+                    , { field: 'HNumber', title: '鐗╂枡缂栫爜', width: 105 }
+                    , { field: 'HName', title: '鐗╂枡鍚嶇О', width: 105 }
+                    , { field: 'HModel', title: '瑙勬牸鍨嬪彿', width: 105 }
+                    , { field: 'HQty', title: '鏁伴噺', width: 80 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 80 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 195 }
+                    , { toolbar: '#toolBar', width: 65, fixed: 'right' }
+                ];
+                option = {
+                    id: 'smjl-table'
+                    , elem: '#smjl-table'                 
+                    , page: false
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+        
+            //鑾峰彇鍗曟嵁鍙�
+            getBillno();
+         
 
 
             //濉啓瑁呯鏁伴噺鍚庡厜鏍囪烦璧�
@@ -747,6 +757,13 @@
                 var LDM = $("#LDM").val();//
                 var BBM = $("#BBM").val();//
                 var HBarCode_White = $("#HBarCode_White").val();//鐧芥爣鍙�
+                var NBXMH = $("#NBXMH").val();//鍐呴儴椤圭洰鍙�
+
+                if (NBXMH == "" || NBXMH == "鍏朵粬") {
+                    playSound();
+                    layer.alert("鍐呴儴椤圭洰涓嶈兘涓虹┖鎴栬�呬笉鑳戒负鍏朵粬!", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    return;
+                }
 
                 //if (HBarCode_White == "") {
                 //    playSound();
@@ -794,6 +811,7 @@
                         , "LDM": LDM
                         , "HMaterNumber": $("#HNumber").val()
                         , "HOrgID": $("#HOrgID").val()
+                        , "NBXMH": $("#NBXMH").val()
                     },
                     success: function (result) {
                         var data = result.data;
@@ -801,9 +819,7 @@
                             playSound();
                             layer.msg("鎵弿鎴愬姛", { time: 5000, icon: 6 });
                         } else {
-                            playSound();
-                            // $("#verifycode").click();
-                            //layer.msg(result.Message, { icon: 5 });
+                            playSound();                           
                             layer.alert("鎻掑叆涓昏〃澶辫触", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                             return;
                         }
@@ -1011,13 +1027,7 @@
             //鎵撳嵃鎸夐挳
             form.on('submit(Print2)', function (data) {//閫�鍑�
                 //鎵撳紑鎵撳嵃妯℃澘
-                var linterid = $("#HInterID").val();
-                //var linterid = "28973";
-                //var Type = "HBarCodePrint";
-                //var OpenTmp = "鍖呰鍗曠墿鏂欐爣璇嗗崱(缃戦〉鐗�)";
-                //var ReportViewer = document.getElementById("ReportViewer");
-                //window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
-
+                var linterid = $("#HInterID").val();               
                 var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by 鐗╂枡浠g爜";
                 $.ajax({
                     type: "GET",
@@ -1076,8 +1086,7 @@
                 var linterid = $("#HInterID").val();
                 var Type = "HBarCodePrint";
                 var HOrgID = $("#HOrgID").val();
-                var OpenTmp = "鐧芥爣鎵撳嵃15";
-                //var ReportViewer = document.getElementById("ReportViewer");
+                var OpenTmp = $("#dymb").val();
                 window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid.toString() + "|" + HOrgID +  "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
                 $("#Print2").click();
             });
@@ -1201,6 +1210,7 @@
                         , "HNumber": $("#HNumber").val()
                         , "HName": $("#HMaterName").val()
                         , "HModel": $("#HModel").val()
+                        , "NBXMH": $("#NBXMH").val()
                         , "HOrgID": $("#HOrgID").val()
                     },
                     success: function (result) {
@@ -1260,6 +1270,54 @@
                     }
                 });
             }
+
+            //鑾峰彇鎵撳嵃妯℃澘
+            function GetHBarCodePrint() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                    data: { "HNumber": HModName },
+                    success: function (result) {
+                        var HBarCodePrint = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HBarCodePrint += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#dymb").append(HBarCodePrint);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+
+            //鑾峰彇椤圭洰鍙�
+            function GetHProject() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/LEMS/GetHProject_MXG",
+                    data: { "HOrgID": $("#HOrgID").val() },
+                    success: function (result) {
+                        var NBXMH = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                NBXMH += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#NBXMH").append(NBXMH);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
             //浠ヤ笂涓簂ayui妯″潡
         });
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html"
index 9744013..c80d669 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/RetrospectionCustomerReport.html"
@@ -1,15 +1,21 @@
 锘�<!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 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/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -27,13 +33,13 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input" name="寮�濮嬫椂闂�" id="寮�濮嬫椂闂�">
+                                        <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃堕棿</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input" name="缁撴潫鏃堕棿" id="缁撴潫鏃堕棿">
+                                        <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -93,10 +99,7 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
+
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -111,94 +114,78 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
-                , util = layui.util;
-            //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
+                , util = layui.util;          
             var sWhere = "";
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                //, height: 'full-10'
-                , page: true
-                , limit: 50
-                , limits: [50, 500, 5000, 20000]
-                , cols: [[
-                    {
-                        field: '缁勬墭鍗曟棩鏈�', title: '缁勬墭鍗曟棩鏈�', sort: true,width:115, templet: function (d) {
-                            if (d.缁勬墭鍗曟棩鏈� == null) {
-                                return "";
+           
+
+            //#region 鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();               
+                //鍒濆鍖栨棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 2), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                get_FastQuery();
+            }
+            //琛ㄦ牸鏁版嵁
+            function set_InitGrid() {
+                var option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'                 
+                    , page: true
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        {
+                            field: '缁勬墭鍗曟棩鏈�', title: '缁勬墭鍗曟棩鏈�', sort: true, width: 115, templet: function (d) {
+                                if (d.缁勬墭鍗曟棩鏈� == null) {
+                                    return "";
+                                }
+                                return util.toDateString(d.缁勬墭鍗曟棩鏈�, "yyyy-MM-dd");
                             }
-                            return util.toDateString(d.缁勬墭鍗曟棩鏈�, "yyyy-MM-dd");
                         }
+                        , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 140 }
+                        , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 140 }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                        , { field: '鐢熶骇娴佽浆鍗″彿', title: '鐢熶骇娴佽浆鍗″彿', width: 130 }
+                        , { field: '鎵樼洏鍙�', title: '鎵樼洏鍙�', width: 160 }
+                        , { field: '榛戞爣鍙�', title: '榛戞爣鍙�', width: 80 }
+                        , { field: '鐧芥爣鍙�', title: '鐧芥爣鍙�', width: 100 }
+                        , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', width: 130 }
+                        , { field: '鍖呰鍗曟潯鐮�', title: '鍖呰鍗曟潯鐮�', width: 170 }
+                        , { field: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', title: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', width: 160 }
+                    ]]
+                    , text: {
+                        none: '鏆傛棤鐩稿叧鏁版嵁锛�'
                     }
-                    , { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 140 }
-                    , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 140 }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
-                    , { field: '鐢熶骇娴佽浆鍗″彿', title: '鐢熶骇娴佽浆鍗″彿', width: 130 }
-                    , { field: '鎵樼洏鍙�', title: '鎵樼洏鍙�', width: 160 }
-                    , { field: '榛戞爣鍙�', title: '榛戞爣鍙�', width: 80 }
-                    , { field: '鐧芥爣鍙�', title: '鐧芥爣鍙�', width: 100 }
-                    , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', width: 130 }
-                    , { field: '鍖呰鍗曟潯鐮�', title: '鍖呰鍗曟潯鐮�', width: 170 }
-                    , { field: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', title: '闀洉鐮佸寘瑁呭瓙浠舵潯鐮�', width: 160 }
-                ]]
-                , text: {
-                    none: '鏆傛棤鐩稿叧鏁版嵁锛�'
-                }
-            };
+                };
 
-            option.data = [];
-            table.render(option);
+                option.data = [];
+                table.render(option);
+            }
 
+           
 
-            //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
-            layer.load(3);
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Report/RetrospectionCustomerReport',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.closeAll("loading");
-                    } else {
-                        layer.closeAll("loading");
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#寮�濮嬫椂闂�").val("");
-                $("#缁撴潫鏃堕棿").val("");
-                $("#榛戞爣鍙�").val("");
-                $("#鎵樼洏鍙�").val("");
-                $("#鍖呰鍗曞彿").val("");
-                $("#鐧芥爣鍙�").val("");
-                $("#闀洉鐮�").val("");
-                $("#btnSearch").click();
-            });
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var 寮�濮嬫椂闂� = $("#寮�濮嬫椂闂�").val();
-                var 缁撴潫鏃堕棿 = $("#缁撴潫鏃堕棿").val();
+            // 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var 榛戞爣鍙� = $("#榛戞爣鍙�").val();
                 var 鎵樼洏鍙� = $("#鎵樼洏鍙�").val();
                 var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
                 var 鐧芥爣鍙� = $("#鐧芥爣鍙�").val();
                 var 闀洉鐮� = $("#闀洉鐮�").val();
-                if (寮�濮嬫椂闂�) {
-                    sWhere += " and 缁勬墭鍗曟棩鏈� > '" + 寮�濮嬫椂闂� + "'";
+                if (HDate) {
+                    sWhere += " and 缁勬墭鍗曟棩鏈� >= '" + HDate + "'";
                 }
-                if (缁撴潫鏃堕棿) {
-                    sWhere += " and 缁勬墭鍗曟棩鏈� < '" + 缁撴潫鏃堕棿 + "'";
+                if (HDate1) {
+                    sWhere += " and 缁勬墭鍗曟棩鏈� <='" + HDate1 + "'";
                 }
                 if (榛戞爣鍙�) {
                     sWhere += " and 榛戞爣鍙� like '%" + 榛戞爣鍙� + "%'";
@@ -215,6 +202,26 @@
                 if (闀洉鐮�) {
                     sWhere += " and 闀洉鐮佸寘瑁呭瓙浠舵潯鐮� like '%" + 闀洉鐮� + "%'";
                 }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            // 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 2), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#榛戞爣鍙�").val("");
+                $("#鎵樼洏鍙�").val("");
+                $("#鍖呰鍗曞彿").val("");
+                $("#鐧芥爣鍙�").val("");
+                $("#闀洉鐮�").val("");
+                get_FastQuery();
+                sWhere = "";
+            }
+         
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                layer.load(3);
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Report/RetrospectionCustomerReport',
@@ -224,15 +231,25 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.closeAll("loading");
                         } else {
+                            layer.closeAll("loading");
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();            
             });
 
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html"
index f3817b8..f8ca427 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/Sc_GroupOrderBillList.html"
@@ -49,7 +49,13 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label" style="width: 85px;"  id="BT_HOrgName">缁勭粐鍚嶇О</label>
+                                    <label class="layui-form-label" id="BT_HHBH">榛戞爣鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="榛戞爣鍙�" id="榛戞爣鍙�">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;" id="BT_HOrgName">缁勭粐鍚嶇О</label>
                                     <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                         <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" class="ForFilteringSchemes">
                                             <!--鍔ㄦ�佹覆鏌撶粍缁�-->
@@ -229,6 +235,7 @@
                 var 寮�濮嬫椂闂� = $("#寮�濮嬫椂闂�").val();
                 var 缁撴潫鏃堕棿 = $("#缁撴潫鏃堕棿").val();
                 var 缁勬墭鍗曞彿 = $("#缁勬墭鍗曞彿").val();
+                var 榛戞爣鍙� = $("#榛戞爣鍙�").val();
                 var 鍒跺崟浜� = $("#鍒跺崟浜�").val();
                 var 缁勬墭鍗曞敮涓�鏉$爜 = $("#缁勬墭鍗曞敮涓�鏉$爜").val();
                 var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
@@ -254,6 +261,9 @@
                 if (鍖呰鍗曞敮涓�鏉$爜) {
                     sWhere += " and 鍖呰鍗曞敮涓�鏉$爜 like '%" + 鍖呰鍗曞敮涓�鏉$爜 + "%'";
                 }
+                if (榛戞爣鍙�) {
+                    sWhere += " and 榛戞爣鍙� like '%" + 榛戞爣鍙� + "%'";
+                }
 
                 sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
index fbac142..5c95b68 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill_BatchSplit.html"
@@ -8,38 +8,36 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script src="../../../layuiadmin/PageTitle.js"></script>
-    <script src="../../../layuiadmin/grwebapp.js"></script>
-    <style type="text/css">
-        .layui-form-item .layui-inline {
-            margin-right: 0;
-        }
-
-        html {
-            background-color: white;
-            color: white;
-        }
-
-        .layui-table-cell {
+    <style>
+        td:has(select) .layui-table-cell {
             overflow: visible !important;
+            padding: 0;
         }
-
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
         td .layui-form-select {
             margin-top: -10px;
-            margin-left: -15px;
-            margin-right: -15px;
+            /*  margin-left: -15px;
+            margin-right: -15px;*/
+        }
+
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
         }
 
         .layui-table th, .layui-table td {
-            white-space: nowrap; /* 涓嶆崲琛� */
-            overflow: hidden; /* 瓒呭嚭鍐呭闅愯棌 */
+            white-space: nowrap; /* 涓嶆崲琛� */            
             text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
         }
     </style>
@@ -48,7 +46,7 @@
     <div class="layui-fluid" style="padding: 0;">
         <div class="layui-card" style="padding: 15px;">
             <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" lay-filter="component-form-group" action="">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div class="layui-card-header">
                         <div class="layui-btn-group">
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
@@ -60,22 +58,44 @@
                     <div class="layui-tab" lay-filter="tab-BatchSplit">
                         <h1 style="text-align: center; padding: 10px 0;"><b>娴佽浆鍗℃壒閲忔媶鍒�</b></h1>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable" style="margin-top:5px;"></table>
-                    <script type="text/html" id="xuhao">
-                        {{d.LAY_TABLE_INDEX+1}}
-                    </script>
-                    <script type="text/html" id="toolbarDemo">
-                        <div class="layui-btn-container">
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                    <div class="layui-tab" lay-filter="tab-BatchSplit">
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                <script type="text/html" id="toolbarDemo">
+                                    <div class="layui-btn-container">
+                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                                    </div>
+                                </script>
+                            </div>
                         </div>
-                    </script>
+                    </div>
                 </form>
             </div>
         </div>
     </div>
+
+    <!--閫夋嫨妗�-->
+    <script type="text/html" id="HMouldNum-select">
+        <select name="HMouldNum" lay-filter="HMouldNum" id="HMouldNum{{d.LAY_TABLE_INDEX+1}}">
+            <option value="0#" selected>0#</option>
+            <option value="1#">1#</option>
+            <option value="2#" >2#</option>
+            <option value="3#">3#</option>
+            <option value="4#">4#</option>
+            <option value="5#">5#</option>
+            <option value="6#">6#</option>
+            <option value="7#">7#</option>
+            <option value="8#">8#</option>
+            <option value="9#">9#</option>
+            <option value="10#">10#</option>
+        </select>
+    </script>
+
     <script type="text/html" id="barDemo">
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+
     <script>
         //#region 鎶樺彔娉ㄩ噴
         //#endregion
@@ -83,16 +103,17 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element', 'laydate'], function () {
-            //#region 鍏敤鍙橀噺
+        }).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 sWhere = "";
+
             var option;
             //#endregion
 
@@ -165,6 +186,7 @@
                                     HArrIndex = i;
                                     option.data[i].HSheetQty = Number(option.data[i].HSheetQty) + Number(1);
                                 }
+                                $('#HMouldNum' + i + '').find("option[value='" + option.data[i].HMouldNum + "']").attr("selected", true);
                             }
                             if (HArrIndex != -1) {
                                 option.data.splice(HArrIndex + 1, 0, JSON.parse(copyrow))
@@ -173,6 +195,7 @@
                             //table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             //option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            form.render('select');
                         }
                         break;
                 }
@@ -233,6 +256,18 @@
                 table.render(option);
             });
 
+            //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
+            form.on('select(HMouldNum)', function (data) {
+                //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+                var elem = data.othis.parents('tr');
+                var dataindex = elem.attr("data-index");
+                $.each(option.data, function (index, value) {
+                    if (value.LAY_TABLE_INDEX == dataindex) {
+                        value.HMouldNum = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+
             //淇濆瓨鎸夐挳
             form.on('submit(Saver)', function (data) {
                 if (AllowLoadData(data)) {
@@ -268,7 +303,6 @@
                     , toolbar: '#toolbarDemo'
                     , limit: 500
                     , height: 500
-                    , loading: false
                     , cols: [[ //瀛愯〃
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { type: 'numbers', title: '搴忓彿', width: 100, totalRow: true }
@@ -285,7 +319,10 @@
                         , { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
                         , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
                         , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
-                        , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
+                        , { field: 'HBatchNo', title: '鎵规鍙�', width: 110, edit: 'text' }
+                        , { field: 'HProjectNum', title: '椤圭洰缂栧彿', width: 110, edit: 'text' }
+                        , { field: 'HMateOutBatchNo', title: '鍘熸枡鎵规', width: 110, edit: 'text' }
+                        , { field: 'HMouldNum', title: '妯$┐鍙�', width: 110, templet: '#HMouldNum-select' }
                         , { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
                         , { field: 'HBatchManager', title: '鍚敤鎵规', width: 110, hide: true }
                         , { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
@@ -303,11 +340,15 @@
                     "HICMOInterID": 0, "HICMOEntryID": 0, "HICMOBillNo": "", "HWorkShopID": 0, "HMaterID": 0, "鐗╂枡浠g爜": ""
                     , "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HQty": 0, "HFinishQty": 0, "HUsableQty": 0, "HLotcardQty": 0
                     , "HProQty": 0, "HRoutingInterID": 0, "HRoutingName": "", "HSheetQty": 0
-                    , "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HBatchManager": "", "HGroupNumber": ""
+                    , "HInterID": 0, "HBillNo": "", "HBatchNo": "", "HProjectNum": "", "HMateOutBatchNo": "", "HMouldNum": "0#", "HBatchManager": "", "HGroupNumber": ""
                 }];
 
                 option.data = rowdata;
                 table.render(option);
+                for (var i = 1; i <= option.data.length; i++) {
+                    $('#HMouldNum' + i + '').find("option[value='" + option.data[i - 1].HMouldNum + "']").attr("selected", true);
+                }
+                form.render('select');
             }
 
             //鎵归噺鎷嗗垎鐢熶骇璁㈠崟鐢熸垚娴佽浆鍗�
@@ -327,7 +368,7 @@
                             var HSourceInterID = 0;
                             var HSourceEntryID = 0;
                             var k = 01;
-                            for (var i = 0; i < subdata.length; i++) {                               
+                            for (var i = 0; i < subdata.length; i++) {
 
                                 //棣栨杩涘叆锛岃幏鍙栨祦杞崱鍗曞彿
                                 if (i == 0) {
@@ -380,18 +421,6 @@
                                     HSourceEntryID = subdata[i].HICMOEntryID;
                                 }
 
-                              
-                                ////鑾峰彇娴佽浆鍗″崟鍙凤紝鍐呯爜
-                                //$.ajax({
-                                //    url: GetWEBURL() + "/Web/GetMAXNumPDA",
-                                //    type: "GET",
-                                //    data: { "HBillType": '3772' },
-                                //    async: false,
-                                //    success: function (d) {
-                                //        HInterID = d.data[0].HInterID;
-                                //        HBillNo = d.data[0].HBillNo;
-                                //    }
-                                //});
 
                                 rowdata.push(
                                     {
@@ -402,7 +431,7 @@
                                         , "HUsableQty": subdata[i].HUsableQty, "HLotcardQty": subdata[i].HLotcardQty, "HProQty": subdata[i].HProQty
                                         , "HRoutingInterID": subdata[i].HRoutingInterID, "HRoutingName": subdata[i].HRoutingName, "HSheetQty": subdata[i].HSheetQty
                                         , "HDate": formatDate(subdata[i].HDate), "HInterID": HInterID, "HBillNo": HBillNo, "HBatchNo": subdata[i].HBatchNo
-                                        , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": ""
+                                        , "HBatchManager": subdata[i].鏄惁鍚敤鎵规, "HGroupNumber": "", "HProjectNum": "", "HMateOutBatchNo": "", "HMouldNum": "0#"
                                     }
                                 )
                             }
@@ -428,7 +457,10 @@
                                     , { field: 'HUsableQty', title: '鍓╀綑鍙敤鏁伴噺', width: 130 }
                                     , { field: 'HLotcardQty', title: '鍗曞紶娴佽浆鍗℃暟', width: 130 }
                                     , { field: 'HProQty', title: '娴佽浆鍗℃暟閲�', width: 110, edit: 'text' }
-                                    , { field: 'HBatchNo', title: '鎵瑰彿', width: 110, edit: 'text' }
+                                    , { field: 'HBatchNo', title: '鎵规鍙�', width: 110, edit: 'text' }
+                                    , { field: 'HProjectNum', title: '椤圭洰缂栧彿', width: 110, edit: 'text' }
+                                    , { field: 'HMateOutBatchNo', title: '鍘熸枡鎵规', width: 110, edit: 'text' }
+                                    , { field: 'HMouldNum', title: '妯$┐鍙�', width: 110, templet: '#HMouldNum-select' }
                                     , { field: 'HGroupNumber', title: '鐝粍', width: 110, edit: 'text' }
                                     , { field: 'HBatchManager', title: '鍚敤鎵规', width: 110, hide: true }
                                     , { field: 'HRoutingInterID', title: '宸ヨ壓璺嚎鍐呯爜', width: 150, hide: true }
@@ -469,6 +501,11 @@
                             }
                             option.data = rowdata;
                             table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HMouldNum' + i).find("option[value='" + option.data[i - 1].HMouldNum + "']").attr("selected", true).trigger("change");
+
+                            }
+                            form.render('select');
 
                             layer.close(ajaxLoad);
                         } else {
@@ -715,9 +752,11 @@
                                 if (option.data[i].HICMOInterID == data.HICMOInterID && option.data[i].HICMOEntryID == data.HICMOEntryID) {
                                     option.data[i].HSheetQty = Number(option.data[i].HSheetQty) - Number(1);
                                 }
+                                $('#HMouldNum' + i).find("option[value='" + oldData[i].HMouldNum + "']").attr("selected", true);
                             }
 
                             table.render(option);
+                            form.render('select');
                             layer.close(index);
                         }
                     });
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/Mes_OrderProcFlowAllReport_TK.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/Mes_OrderProcFlowAllReport_TK.html"
new file mode 100644
index 0000000..8378ee8
--- /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/Mes_OrderProcFlowAllReport_TK.html"
@@ -0,0 +1,529 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div 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" name="HDate1" id="HDate1">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" name="HDate2" id="HDate2" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" 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-block">
+                                            <input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-block">
+                                            <input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="鍙樉绀烘湭瀹屽伐">
+                                        </div>
+                                    </div>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                </div>
+                                
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "Mes_OrderProcFlowAllReport";
+            var ins;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'btn-exit': Pub_Close(2);
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        var 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().replaceAll(/[\r\n]+/g, '').replaceAll(',','锛�');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                                }
+                            }
+                        });
+
+                        table.exportFile(ins.config.id, option.data, "xls");
+                        break;
+                };
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //鐗╂枡
+            form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
+                get_btnHMaterID();
+            });
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HDate1').prop('disabled', true);
+                    $('#HDate2').prop('disabled', true);
+
+                    $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HDate1').prop('disabled', false);
+                    $('#HDate2').prop('disabled', false);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HDate1').prop('disabled', true);
+                    $('#HDate2').prop('disabled', true);
+                } else {
+                    $('#HDate1').prop('disabled', false);
+                    $('#HDate2').prop('disabled', false);
+                }
+                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();
+              
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , cellMinWidth: 120
+                    , totalRow: true
+                    , limit: Number.MAX_VALUE // 鏁版嵁琛ㄦ牸榛樿鍏ㄩ儴鏄剧ず
+                    , height: 'full-70'
+                };
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var totalArray = ["寮傚父璇勫娆℃暟", "璁″垝鏁伴噺", "鎺ュ彈宸ュ簭鏁伴噺1", "姹囨姤宸ュ簭鏁伴噺1", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�1", "鎺ユ敹宸ュ簭鏁伴噺2", "姹囨姤宸ュ簭鏁伴噺2", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�2", "鎺ユ敹宸ュ簭鏁伴噺3", "姹囨姤宸ュ簭鏁伴噺3", "姹囨姤涓嶅悎鏍煎伐搴忔暟閲�3", "鎺ユ敹宸ュ簭鏁伴噺4","姹囨姤宸ュ簭鏁伴噺4","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�4","鎺ユ敹宸ュ簭鏁伴噺5","姹囨姤宸ュ簭鏁伴噺5","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�5","鎺ユ敹宸ュ簭鏁伴噺6","姹囨姤宸ュ簭鏁伴噺6","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�6","鎺ユ敹宸ュ簭鏁伴噺7","姹囨姤宸ュ簭鏁伴噺7","姹囨姤涓嶅悎鏍煎伐搴忔暟閲�7"];
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                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].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, 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].name, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            ins = table.render(option);
+                            DisPlay_HideColumn();
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate1 = $("#HDate1").val();
+                var HDate2 = $("#HDate2").val();
+                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//璁㈠崟璺熻釜鍙�
+                var txtHMaterNumber = $("#txtHMaterNumber").val(); //鐗╂枡
+                var txtHDeptName = $("#txtHDeptName").val(); //鐗╂枡
+                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//澶嶉�夋
+                var check = "";
+                if (chkHShowUnFinish) {
+                    check = "Y";
+                }
+               
+                sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#txtHOrderProcNo").val("");
+                $("#txtHMaterNumber").val("");
+                $("#txtHDeptName").val("");
+                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
+                $("#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 = " ";
+                get_FastQuery();
+            }
+
+
+
+            //#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("1");
+            }
+            //#endregion
+
+            //#endregion
+            //鐗╂枡
+            function get_btnHMaterID() {
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '鐗╂枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                })
+            }
+
+            //闅愯棌鍒楄缃�
+            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);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTablemainTable)', 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
+
+            //鏄剧ず鍒楁暟鎹�
+            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) {
+                            titleData = [];
+                            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);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+
+
+            //#endregion
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.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_ICOMReport.html"
index 5883779..d3adc2b 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/sc_ICOMReport.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_ICOMReport.html"
@@ -429,19 +429,19 @@
                 sWhere = " and 鏃ユ湡 between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
 
                 if (HMaterNumber != "") {
-                    sWhere += " and 鐗╂枡浠g爜=''" + HMaterNumber + "'' ";
+                    sWhere += " and 鐗╂枡浠g爜 like ''%" + HMaterNumber + "%'' ";
                 }
 
                 if (HBillNo != "") {
-                    sWhere += " and 鍗曟嵁鍙�=''" + HBillNo + "'' ";
+                    sWhere += " and 鍗曟嵁鍙� like ''%" + HBillNo + "%'' ";
                 }
 
                 if (HProductName != "") {
-                    sWhere += " and 鐗╂枡鍚嶇О=''" + HProductName + "'' ";
+                    sWhere += " and 鐗╂枡鍚嶇О like ''%" + HProductName + "%'' ";
                 }
 
                 if (HProductModel != "") {
-                    sWhere += " and 瑙勬牸鍨嬪彿=''" + HProductModel + "'' ";
+                    sWhere += " and 瑙勬牸鍨嬪彿 like ''%" + HProductModel + "%'' ";
                 }
 
                 //浠绘剰瀛楁鏉′欢杩囨护 鏉′欢鎻愬彇
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_TestByLLJ.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_TestByLLJ.html"
new file mode 100644
index 0000000..4889a71
--- /dev/null
+++ "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_TestByLLJ.html"
@@ -0,0 +1,3137 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏉ユ枡閫氱煡鍗曠紪杈�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button>
+                            <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>鎵撳嵃</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: auto;">杈撳叆绫诲瀷:</label>
+                            <div class="layui-input-inline" style="width: 100px;">
+                                <select name="HInputType" id="HInputType" lay-filter="HInputType">
+                                    <option value="瀛楃" selected>瀛楃</option>
+                                    <option value="鏃ユ湡">鏃ユ湡</option>
+                                    <option value="甯冨皵">甯冨皵</option>
+                                    <option value="鏁存暟">鏁存暟</option>
+                                    <option value="娴偣鏁�">娴偣鏁�</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鏀舵枡閫氱煡鍗�</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="date" class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;display:none;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <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" style="width:40px;display:none;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline" style="width:800px">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:750px;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 750px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;display:none;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;display:none;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍙戠エ缂栧彿</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off" style="width:150px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">涓荤</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
+                                                    <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
+                                                </select>
+                                            </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="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly>
+
+                                                <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-row" style="display:none;">
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="display:none;">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">椤圭洰缂栫爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnHProjectID" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">椤圭洰鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width:800px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 120px; width: 800px;">
+                                            <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="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>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="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>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>-->
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>-->
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>-->
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+
+
+                        </div>
+
+                        <!-- 鏂板鐨勫瓙琛ㄨ緭鍏ョ被鍨嬫帶鍒朵笅鎷夋 -->
+                        <label class="layui-form-label" style="width: auto; margin-left: 10px;">瀛愯〃杈撳叆绫诲瀷:</label>
+                        <div class="layui-input-inline" style="width: 100px;">
+                            <select name="SubInputType" id="SubInputType" lay-filter="SubInputType">
+                                <option value="瀛楃" selected>瀛楃</option>
+                                <option value="鏁存暟">鏁存暟</option>
+                                <option value="娴偣鏁�">娴偣鏁�</option>
+                                <option value="鏃ユ湡">鏃ユ湡</option>
+                            </select>
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //#region 鏂囨湰妗嗚緭鍏ユ悳绱㈢浉鍏虫暟鎹�-鍙橀噺
+        var childPage = null;                       //鑾峰彇瀛愮獥鍙e璞★紝鐢ㄤ簬鎿嶄綔瀛愮獥鍙g殑鍙橀噺鍜屾柟娉�
+        var currRowIndex = 0;                       //鐢ㄤ簬瀹氫綅瀛愮獥鍙e綋鍓嶉�変腑鐨勮
+        var childData = null;                       //鐢ㄤ簬鑾峰彇瀛愮獥鍙h繑鍥炵殑鏁版嵁
+        //#endregion
+
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+            var sWhere = "";
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            var topScroll = 0;//璁板綍婊氬姩鏉$殑浣嶇疆
+            var allVal;
+            window.OptionData = [];
+            //#endregion
+            var HModName = "Add_Edit_Cg_POInStockBillList"
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+            //鑾峰彇缁勭粐
+            Organ();
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1103";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) || $("h1").html();
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+
+            //#endregion
+            //#region   ceshi
+            // 褰撳墠杈撳叆绫诲瀷
+            var currentInputType = '瀛楃';
+
+
+            form.on('select(HInputType)', function (data) {
+                currentInputType = data.value;
+                layer.msg('宸插垏鎹㈠埌 ' + data.value + ' 杈撳叆妯″紡', { icon: 1, time: 1000 });
+                var placeholder = '';
+                switch (data.value) {
+                    case '鏃ユ湡':
+                        placeholder = '璇疯緭鍏ユ棩鏈熸牸寮�: yyyy-MM-dd';
+                        break;
+                    case '甯冨皵':
+                        placeholder = '璇疯緭鍏� true 鎴� false';
+                        break;
+                    case '鏁存暟':
+                        placeholder = '璇疯緭鍏ユ暣鏁�';
+                        break;
+                    case '娴偣鏁�':
+                        placeholder = '璇疯緭鍏ユ诞鐐规暟';
+                        break;
+                    case '瀛楃':
+                    default:
+                        placeholder = '璇疯緭鍏ユ枃鏈�';
+                        break;
+                }
+                $('#HRemark').attr('placeholder', placeholder);
+            });
+            form.on('submit(HRemark)', function (data) {
+                return false;
+            });
+            $('#HRemark').on('input propertychange', function () {
+                validateInputType($(this).val(), currentInputType, $(this));
+            });
+
+            // 浼樺寲娴偣鏁伴獙璇�
+            function validateInputType(value, type, inputElement) {
+                if (!value) return true;
+
+                var isValid = true;
+                var errorMsg = '';
+
+                switch (type) {
+                    case '鏃ユ湡':
+                        var dateRegex = /^[-0-9]*$/;
+                        if (!dateRegex.test(value)) {
+                            isValid = false;
+                            errorMsg = '鏃ユ湡鏍煎紡涓嶆纭紝璇蜂娇鐢� yyyy-MM-dd 鏍煎紡';
+                        }
+                        if ((value.length == 5 && value[4] != '-') || (value.length == 8 && value[7] != '-')) {
+                            var dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+                            if (!dateRegex.test(value)) {
+                                isValid = false;
+                                errorMsg = '鏃ユ湡鏍煎紡涓嶆纭紝璇蜂娇鐢� yyyy-MM-dd 鏍煎紡';
+                            }
+                        }
+                        break;
+
+                    case '甯冨皵':
+                        var boolRegex = /^(true|false|TRUE|FALSE|鏄瘄鍚瀵箌閿檤1|0)$/;
+                        isValid = boolRegex.test(value);
+                        errorMsg = '璇疯緭鍏� true/false銆佹槸/鍚� 鎴� 1/0';
+                        break;
+
+                    case '鏁存暟':
+                        var intRegex = /^-?\d+$/;
+                        isValid = intRegex.test(value);
+                        errorMsg = '璇疯緭鍏ユ暣鏁�';
+                        break;
+
+                    case '娴偣鏁�':
+                        var floatRegex = /^(?:\d*\.?\d*|\d+\.)$/;
+                        isValid = floatRegex.test(value);
+                        errorMsg = '璇疯緭鍏ユ湁鏁堢殑娴偣鏁�';
+                        break;
+
+                    case '瀛楃':
+                    default:
+                        isValid = true;
+                        break;
+                }
+
+                if (!isValid) {
+                    layer.msg(errorMsg, { icon: 2, time: 2000 });
+                    // 娓呯┖闈炴硶杈撳叆
+                    inputElement.val('');
+                }
+
+                return isValid;
+            }
+
+            //#endregion
+
+            //#region 瀛愯〃绫诲瀷鎺у埗
+            var currentSubInputType = '瀛楃';
+
+            // 鐩戝惉瀛愯〃杈撳叆绫诲瀷鍒囨崲
+            form.on('select(SubInputType)', function (data) {
+                currentSubInputType = data.value;
+                layer.msg('瀛愯〃宸插垏鎹㈠埌 ' + data.value + ' 杈撳叆妯″紡', { icon: 1, time: 1000 });
+
+                // 涓烘墍鏈夊彲缂栬緫鐨勫崟鍏冩牸璁剧疆杈撳叆闄愬埗
+                setTableCellInputType();
+            });
+            // 璁剧疆琛ㄦ牸鍗曞厓鏍艰緭鍏ョ被鍨嬮檺鍒� - 浼樺寲鐗堟湰
+            function setTableCellInputType() {
+                // 鑾峰彇鎵�鏈夊彲缂栬緫鐨勫崟鍏冩牸
+                $('.layui-table-edit').each(function () {
+                    var $input = $(this);
+                    var field = $input.closest('td').data('field');
+
+                    // 瀵瑰娉ㄥ瓧娈佃繘琛岀壒娈婂鐞�
+                    if (field === 'HRemark') {
+                        switch (currentSubInputType) {
+                            case '鏁存暟':
+                                $input.attr('type', 'number').attr('step', '1');
+                                $input.attr('placeholder', '璇疯緭鍏ユ暣鏁�');
+                                break;
+                            case '娴偣鏁�':
+                                $input.attr('type', 'number').attr('step', '0.01');
+                                $input.attr('placeholder', '璇疯緭鍏ユ暟瀛�');
+                                break;
+                            case '鏃ユ湡':
+                                $input.attr('type', 'date');
+                                $input.attr('placeholder', '璇烽�夋嫨鏃ユ湡');
+                                break;
+                            case '瀛楃':
+                            default:
+                                $input.attr('type', 'text');
+                                $input.attr('placeholder', '璇疯緭鍏ユ枃鏈�');
+                                break;
+                        }
+                    }
+                    // 鍘熸湁鐨勫叾浠栧瓧娈靛鐞嗕繚鎸佷笉鍙�
+                    else if (field === 'HQty' || field === 'HPrice' || field === 'HTaxPrice' ||
+                        field === 'HMoney' || field === 'HDiscountRate' || field === 'HTaxRate' ||
+                        field === 'HTaxMoney') {
+
+                        switch (currentSubInputType) {
+                            case '鏁存暟':
+                                $input.attr('type', 'number').attr('step', '1');
+                                $input.attr('placeholder', '璇疯緭鍏ユ暣鏁�');
+                                break;
+                            case '娴偣鏁�':
+                                $input.attr('type', 'number').attr('step', '0.01');
+                                $input.attr('placeholder', '璇疯緭鍏ユ暟瀛�');
+                                break;
+                            case '鏃ユ湡':
+                                $input.attr('type', 'date');
+                                $input.attr('placeholder', '璇烽�夋嫨鏃ユ湡');
+                                break;
+                            case '瀛楃':
+                            default:
+                                $input.attr('type', 'text');
+                                $input.attr('placeholder', '璇疯緭鍏ユ枃鏈�');
+                                break;
+                        }
+                    }
+                });
+            }
+
+            // 鍦ㄨ〃鏍兼覆鏌撳畬鎴愬悗璁剧疆鍒濆杈撳叆绫诲瀷
+            table.on('done(mainTable)', function (obj) {
+                setTableCellInputType();
+            });
+
+            
+
+            // 瀛愯〃杈撳叆绫诲瀷楠岃瘉鍑芥暟
+            function validateSubInputType(value, type) {
+                if (!value) return true;
+
+                switch (type) {
+                    case '鏁存暟':
+                        return /^-?\d+$/.test(value);
+                    case '娴偣鏁�':
+                        return /^-?\d+(\.\d+)?$/.test(value);
+                    case '鏃ユ湡':
+                        // 绠�鍗曠殑鏃ユ湡鏍煎紡楠岃瘉锛屾敮鎸� yyyy-MM-dd 鏍煎紡鎴栧彲瑙f瀽鐨勬棩鏈熷瓧绗︿覆
+                        return /^\d{4}-\d{2}-\d{2}$/.test(value) || !isNaN(Date.parse(value));
+                    case '瀛楃':
+                    default:
+                        return true;
+                }
+            }
+
+            // 鍦ㄨ〃鏍兼覆鏌撳畬鎴愬悗璁剧疆鍒濆杈撳叆绫诲瀷
+            table.on('done(mainTable)', function (obj) {
+                setTableCellInputType();
+            });
+            //#endregion
+            //#region 鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
+                    type: "GET",
+                    data: { "HBillType": '1103' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(d.data[0].HInterID);
+                    }
+                });
+            }
+            //#endregion
+
+            // 鍒濆鍖栫晫
+            set_InitGrid();
+
+            //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
+            if (OperationType == 1) {                                                   //鏃犳簮鍗曟柊澧�
+                /* $("#HItemID").val(0);*/
+
+                //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            }
+            else if (OperationType == 3) {                                              //缂栬緫
+                //淇敼鏃朵富琛↖D
+                $("#HInterID").val(linterid);
+                $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {                     //涓嬫帹
+                setInit_PushBill();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+            //#endregion
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    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].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            var rowdata = [{
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": 0, "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
+                , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0",
+                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0
+            }];
+
+            //鑾峰彇婧愬崟绫诲瀷
+            HSourceBillType();
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                    "HSPID": 0, "浠撲綅鍚嶇О": data.浠撲綅鍚嶇О, "HSecUnitID": data.HSecUnitID, "杈呭姪鍗曚綅": data.杈呭姪鍗曚綅, "HQty": "0", "HRemark": ""
+                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                        break;
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                        break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                }
+            });
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //#region 鏂板
+            form.on('submit(set_AddNew)', function (data) {
+                const url = new URL(location.href);
+                location.href = url.origin + url.pathname;
+            });
+            //#endregion
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(0);
+            });
+            //#endregion
+            //#region 鎵撳嵃
+            form.on('submit(get_PrintReport)', function (data) {
+                get_PrintReport();
+            });
+            //#endregion
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
+            });
+            //閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+            //閫夋嫨甯佸埆鎸夐挳
+            form.on('submit(HCurList)', function () {
+                get_checkCur();
+            });
+
+            //閫夋嫨宸ョ▼椤圭洰
+            form.on('submit(btnHProjectID)', function () {
+                get_btnHProjectID();
+            });
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+            //#endregion
+
+
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^-?\d+(\.\d+)?$/;          //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
+                var temp = "";
+                var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//鑾峰彇婊氬姩鏉′綅缃�
+
+                switch (field) {
+                    case "HQty":                                         //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref1.test(temp)) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
+                            return;
+                        } else if (temp * 1 == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                            , HTaxMoney: HTaxMoney
+                        });
+                        table.render(option)
+                        break;
+                    case "HPrice":                                         //鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HPrice: oldText
+                            });
+                            table.render(option)
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = value * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HTaxPrice = Number(HPrice * (1 + HTaxRate));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                            , HTaxMoney: HTaxMoney
+                            , HTaxPrice, HTaxPrice
+                        });
+                        table.render(option)
+                        break;
+                    case "HTaxRate":                                                       //绋庣巼
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp)) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HTaxRate: oldText
+                            });
+                            table.render(option)
+                            layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                        //鏁板瓧绮惧害
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HTaxRate: HTaxRate * 100
+                            , HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                            , HTaxMoney: HTaxMoney
+                            , HTaxPrice: HTaxPrice
+                        });
+                        table.render(option)
+                        break;
+                    case "HDiscountRate":                                                       //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp)) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HDiscountRate: oldText
+                            });
+                            table.render(option)
+                            layer.msg("鎶樻墸鐜囪杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                        var HDiscountRate = obj.data.HDiscountRate * 1;     //鎶樻墸鐜�
+
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HTaxRate: HTaxRate * 100
+                            , HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                            , HTaxMoney: HTaxMoney
+                            , HTaxPrice: HTaxPrice
+                            , HDiscountRate: HDiscountRate
+                        });
+                        table.render(option);
+                    case "HRemark":                                        //澶囨敞 - 鏂板绫诲瀷鎺у埗
+                        // 鏍规嵁褰撳墠瀛愯〃杈撳叆绫诲瀷杩涜楠岃瘉
+                        if (!validateSubInputType(value, currentSubInputType)) {
+                            // 鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HRemark: oldText
+                            });
+                            table.render(option);
+
+                            var errorMsg = '';
+                            switch (currentSubInputType) {
+                                case '鏁存暟':
+                                    errorMsg = '澶囨敞璇疯緭鍏ユ暣鏁版牸寮忥紒';
+                                    break;
+                                case '娴偣鏁�':
+                                    errorMsg = '澶囨敞璇疯緭鍏ユ暟瀛楁牸寮忥紒';
+                                    break;
+                                case '鏃ユ湡':
+                                    errorMsg = '澶囨敞璇疯緭鍏ユ棩鏈熸牸寮忥紒';
+                                    break;
+                                case '瀛楃':
+                                default:
+                                    errorMsg = '澶囨敞鏍煎紡涓嶆纭紒';
+                                    break;
+                            }
+                            layer.msg(errorMsg, { icon: 2, time: 2000 });
+                            return;
+                        }
+                        break;
+                        break;
+                    case "HTaxPrice":                                         //鍚◣鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";     //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰  鍙橀噺temp
+                        // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+                        if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({            //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+                                HTaxPrice: oldText     //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+                            });
+                            table.render(option);
+                            layer.msg("鍚◣鍗曚环璇疯緭鍏ユ暟瀛�!");   //璇疯緭鍏ュ崟浠风殑鏁板��
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HTaxPrice = value * 1;                    //鍚◣鍗曚环
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HPrice = Number((HTaxPrice / (1 + HTaxRate)));                         //鍗曚环 = 鍚◣鍗曚环/(1+绋庣巼)
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({                    //鏇存柊琛ㄦ牸鏁版嵁                鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+                            HQty: Number(HQty.toFixed(HQtyDec))
+                            , HPrice: Number(HPrice.toFixed(HPriceDec))
+                            , HMoney: Number(HMoney.toFixed(HMoneyDec))
+                            , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                            , HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec))                    //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                        });
+                        table.render(option)
+                        break;
+                    case "HMoney":                                         //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";     //淇敼鍚庣殑鍊� 杞负瀛楃涓� 璧嬪�肩粰  鍙橀噺temp
+                        // ref寰堝彲鑳芥槸涓�涓鍒欒〃杈惧紡瀵硅薄锛岀敤浜庡尮閰嶇壒瀹氱殑瀛楃涓叉ā寮忋�俽ef.test(temp)浼氭鏌ュ彉閲弔emp锛堝嵆杞崲鍚庣殑鍗曚环瀛楃涓诧級鏄惁绗﹀悎ref瀹氫箟鐨勬ā寮忋�傚鏋渢est鏂规硶杩斿洖false
+                        if (!ref.test(temp)) { //妫�鏌ュ崟浠峰瓧绗︿覆鏄惁绗﹀悎棰勬湡鐨勬牸寮�
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({            //鏇存柊琛ㄦ牸鏌愪竴琛屾暟鎹�
+                                HMoney: oldText     //灏唄price瀛楁鎭㈠鍒颁繚瀛樺墠鐨勫��
+                            });
+                            table.render(option);
+                            layer.msg("閲戦璇疯緭鍏ユ暟瀛�!");   //璇疯緭鍏ュ崟浠风殑鏁板��
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;                     //閲戦
+                        var HTaxRate = obj.data.HTaxRate * 0.01;           //绋庣巼
+                        var HPrice = Number((HMoney / HQty));                         //鍗曚环 = 閲戦/(鏁伴噺)
+                        var HTaxPrice = Number(HPrice * (1 + HTaxRate));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+
+
+                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                        var HDiscountRate = obj.data.HDiscountRate * 1;   //鎶樻墸鐜�
+                        //鏁板瓧绮惧害
+                        HQty = Number(HQty.toFixed(HQtyDec));
+                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({                    //鏇存柊琛ㄦ牸鏁版嵁                鏂规硶鏄瀵硅薄鎻愪緵鐨勪竴涓柟娉曪紝鐢ㄤ簬鏇存柊鍏跺唴閮ㄧ姸鎬佹垨涓庝箣鍏宠仈鐨勬暟鎹簮
+                            HQty: Number(HQty.toFixed(HQtyDec))
+                            , HPrice: Number(HPrice.toFixed(HPriceDec))
+                            , HMoney: Number(HMoney.toFixed(HMoneyDec))
+                            , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                            , HTaxPrice: Number(HTaxPrice.toFixed(HPriceDec))                    //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                        });
+                        table.render(option)
+                        break;
+
+                    default:
+                }
+            });
+            //#endregion
+
+            //#region 鍥炶溅閫夋嫨婧愬崟
+            $('#HSourceBillNo').on('keydown', function (event) {
+                var HSourceBillNo = $('#HSourceBillNo').val();//锛堟簮鍗曞崟鎹彿锛�
+                if (event.keyCode == 13) {
+                    var ajaxLoad = layer.load();
+                    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+                    if (HSourceBillNo == "") {
+                        return;
+                    }
+                    $.ajax({
+                        url: GetWEBURL() + '/Cg_POOrderBill/PushList',
+                        type: "GET",
+                        data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var checkStatus = result;
+                                if ($("#HSourceBillType").val() == "1102") {
+                                    option.data = [];//娓呯┖瀛愯〃
+                                    $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+                                    $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+                                    $("#HProjectID").val(checkStatus.data[0].HProjectID);
+                                    $("#HDeptID").val(checkStatus.data[0].HDeptID);
+                                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+                                    $("#HManagerID").val(checkStatus.data[0].HManagerID);
+                                    $("#HManagerName").val(checkStatus.data[0].涓荤);
+                                    $("#HWHID").val(checkStatus.data[0].HWHID);
+                                    $("#HWHName").val(checkStatus.data[0].浠撳簱);
+                                    $("#HEmpID").val(checkStatus.data[0].HEmpID);
+                                    $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+                                    $("#HSupID").val(checkStatus.data[0].HSupID);
+                                    $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+                                    $("#HCurID").val(checkStatus.data[0].HCurID);
+                                    $("#HCurName").val(checkStatus.data[0].甯佸埆);
+                                    $("#HExRate").val(checkStatus.data[0].姹囩巼);
+                                    $("#HAddress").val(checkStatus.data[0].浜よ揣鍦扮偣);
+                                    $("HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿)
+
+                                    var j = 0;
+                                    for (var i = 0; i < result.data.length; i++) {
+                                        var HNewQty = checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺//鏁伴噺
+                                        var HNewMoney = checkStatus.data[j].閲戦 - checkStatus.data[j].鍏宠仈鏁伴噺 * checkStatus.data[j].鍗曚环//鍑忓皯鍏宠仈鏁伴噺鐨勯噾棰�
+                                        var HNewTaxMoney = HNewMoney * checkStatus.data[j].绋庣巼 * 0.01
+                                        option.data.push({
+                                            "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                            "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
+                                            "HQty": HNewQty, "HPrice": checkStatus.data[j].鍗曚环,
+                                            "HMoney": HNewMoney, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": HNewTaxMoney, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+                                            "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О, "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HSecUnitID": checkStatus.data[j].HSecUnitID, "杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+                                            "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                        })
+                                        j++;
+                                    }
+                                    table.render(option);
+                                    layer.close(ajaxLoad);
+                                    layer.msg("鏌ヨ鎴愬姛", { time: 1 * 1000, icon: 1 });
+                                }
+                            } else {
+                                layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                                layer.close(ajaxLoad);
+                            }
+                        }, error: function () {
+                            layer.alert(result.Message + "鍙戠敓閿欒!", { icon: 5 });
+                            layer.close(ajaxLoad);
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+            //#endregion
+            //#endregion
+
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , totalRow: true
+                    , cols: [[ //瀛愯〃
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', width: 100, totalRow: true }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, style: 'background-color:#efefef4d;' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background-color:#efefef4d;' }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
+                        , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
+                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
+                        , { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true }
+                        , { field: '杈呭姪鍗曚綅', title: '杈呭姪鍗曚綅', width: 100, edit: 'text', event: "HSecUnitID" }//f7
+                        , { field: 'HQty', title: '鏁伴噺', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100 }
+                        , { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100 }
+                        , { field: 'HMoney', title: '閲戦', width: 100, totalRow: true }
+                        , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100 }
+                        , { field: 'HTaxRate', title: '绋庣巼', width: 100 }
+                        , { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;' }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                    , done: function (res, curr, count) {
+                        $(".layui-table-main").scrollTop(topScroll);
+                    }
+                }
+
+                option.data = [];
+                table.render(option);
+                DisPlay_HideColumn()
+            }
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Cg_POInStockBill/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            allVal = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data[0].鍗曟嵁鍙�
+                                , "HDate": formatDate(data[0].鏃ユ湡)
+                                , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+                                , "HEmpID": data[0].HEmpID
+                                , "HEmpName": data[0].涓氬姟鍛�
+                                , "HSupID": data[0].HSupID
+                                , "HSupName": data[0].渚涘簲鍟�
+                                , "HWHID": data[0].涓昏〃浠撳簱ID
+                                , "HWHName": data[0].涓昏〃浠撳簱
+                                , "HCurID": data[0].HCurID
+                                , "HCurName": data[0].甯佸埆
+                                , "HExRate": data[0].姹囩巼
+                                , "HDeptName": data[0].閮ㄩ棬
+                                , "HDeptID": data[0].HDeptID
+                                , "HManagerName": data[0].涓荤
+                                , "HManagerID": data[0].HManagerID
+                                , "HSourceBillType": data[0].婧愬崟绫诲瀷
+                                , "HAddress": data[0].浜よ揣鍦扮偣
+                                , "HExRate": data[0].姹囩巼
+                                , "HProjectID": data[0].HProjectID
+                                , "HProjectNumber": data[0].椤圭洰浠g爜
+                                , "HProjectName": data[0].椤圭洰鍚嶇О
+                                , "HInvoiceBillNo": data[0].鍙戠エ缂栧彿
+                                , "Box2": ""
+                                , "HRemark": data[0].琛ㄥご澶囨敞
+                                , "HMaker": data[0].鍒跺崟浜�
+                                , "HChecker": data[0].瀹℃牳浜�
+                                , "HCloseMan": data[0].鍏抽棴浜�
+                                , "HUpDater": data[0].淇敼浜�
+                                , "HDeleteMan": data[0].浣滃簾浜�
+                                , "HMakeDate": data[0].鍒跺崟鏃ユ湡 == null ? "" : Pub_Format(data[0].鍒跺崟鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCheckDate": data[0].瀹℃牳鏃ユ湡 == null ? "" : Pub_Format(data[0].瀹℃牳鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HCloseDate": data[0].鍏抽棴鏃ユ湡 == null ? "" : Pub_Format(data[0].鍏抽棴鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : Pub_Format(data[0].淇敼鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                                , "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : Pub_Format(data[0].浣滃簾鏃ユ湡, "yyyy-MM-dd hh:mm:ss")
+                            });
+
+                            //瀛愯〃  璧嬪��
+                            var rowdata = [];
+                            for (var i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HMaterID": data[i].HMaterID, "鐗╂枡浠g爜": data[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID, "璁¢噺鍗曚綅": data[i].璁¢噺鍗曚綅, "HWHID": data[i].HWHID, "鏀舵枡浠撳簱": data[i].鏀舵枡浠撳簱,
+                                        "HSPID": data[i].HSPID, "浠撲綅鍚嶇О": data[i].浠撲綅鍚嶇О, "HSecUnitID": data[i].HSecUnitID, "杈呭姪鍗曚綅": data[i].杈呭姪鍗曚綅, "HQty": data[i].鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+                                        , "HPrice": data[i].鍗曚环, "HTaxPrice": data[i].鍚◣鍗曚环, "HMoney": data[i].閲戦, "HDiscountRate": data[i].鎶樻墸鐜�, "HTaxRate": data[i].绋庣巼, "HTaxMoney": data[i].绋庨,
+                                        "HSourceBillNo": data[i].婧愬崟鍗曞彿,    //婧愬崟鍙�
+                                        "HSourceBillType": data[i].婧愬崟绫诲瀷,   //婧愬崟绫诲瀷
+                                        "HSourceInterID": data[i].婧愬崟涓诲唴鐮�,   //婧愬崟涓诲唴鐮�
+                                        "HSourceEntryID": data[i].婧愬崟瀛愬唴鐮�     //婧愬崟瀛愬唴鐮�
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                            form.render('select');
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //鏃ユ湡鏍煎紡鍖�
+            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('-');
+            }
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#region 鎵撳嵃
+            function get_PrintReport() {
+                //#region 鍒ゆ柇婧愬崟鐘舵��
+                var HSourceBillData = "";
+                var HSourceBillData = getSourceBillStatus_POInStockBill();
+                if (HSourceBillData != "none") {
+                    if (HSourceBillData.length == 0) {
+                        layer.alert("鎵撳嵃澶辫触!鏈煡璇㈠埌鍗曟嵁淇℃伅!", { icon: 5 });
+                        return;
+                    } else if (HSourceBillData[0]["鐘舵��"] != "宸插鏍�") {
+                        layer.alert("鎵撳嵃澶辫触!鍗曟嵁鐘舵�佹湭涓�'宸插鏍�'鐘舵��!", { icon: 5 });
+                        return;
+                    }
+                } else {
+                    return;
+                }
+                //#endregion
+
+
+                //if (linterid == null || linterid == "") {
+                //    linterid = $("#HInterID").val();
+                //}
+                var HInterID = $("#HInterID").val();
+                layer.open({
+                    type: 2
+                    , area: ['50%', '50%']
+                    , title: '鎵撳嵃妯$増閫夋嫨'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
+                    , resize: false
+                })
+            }
+            //#endregion
+            //#region 淇濆瓨鎸夐挳
+            form.on('submit(Saver)', function (data) {
+                //#region 鍒ゆ柇婧愬崟鐘舵��
+                if (OperationType == 1 || OperationType == 4) {
+
+                    if ($("#HSourceBillType").val() == "1102") {
+                        for (var i = 0; i < option.data.length; i++) {
+                            if (option.data[i] != []) {
+                                var HSourceBillData = "";
+                                var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID);            //鑾峰彇婧愬崟鏁版嵁
+                                if (HSourceBillData != "none") {
+                                    if (HSourceBillData == null) {
+                                        layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+                                        return;
+                                    } else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
+                                        var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
+                                        layer.alert(err, { icon: 5 });
+                                        return;
+                                    } else if (HSourceBillData.琛岀姸鎬� == "宸插叧闂�") {
+                                        layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細璇ヨ璁板綍琛岀姸鎬佷负'宸插叧闂�'鐘舵��!", { icon: 5 });
+                                        return;
+                                    }
+                                } else {
+                                    return;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟锛侊紒');
+                    }
+                }
+                //#endregion
+
+                if (AllowLoadData(data)) {
+                    set_SaveBill(data);
+                }
+            });
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+            function getUrlVars_JSON() {
+                var datajson;
+                var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+                var arr = str.substring(str.lastIndexOf("=") + 1);
+                datajson = $.parseJSON(decodeURI(arr));
+                return datajson;
+            }
+            //#endregion
+
+
+            //#region 涓嬫帹椤甸潰鍒濆鍖�
+            function setInit_PushBill() {
+                //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+                get_MAXNum();
+
+                //鍒濆鍖栨棩鏈熴�佸埗鍗曚汉銆佸埗鍗曟棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+
+                //璁剧疆婧愬崟绫诲瀷
+                $("#BillType").val(HSouceBillType);
+
+                //绂佺敤缁勭粐閫夐」
+                $("#HOrgID").attr("disabled", true);
+
+                //鑾峰彇
+                var data = getUrlVars_JSON().data;
+                var dataArray = [];
+                for (var i = 0; i < data.length; i++) {
+                    var temp = getPushSource_POOrderBillInit(data[i].hmainid, data[i].hsubid);
+                    if (temp != "none") {
+                        dataArray.push(temp);
+                    } else {
+                        return;
+                    }
+                }
+
+
+                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                    "HMainSourceInterID": "0"
+                    , "HMainSourceEntryID": "0"
+                    , "HMainSourceBillNo": ""
+                    , "HMainSourceBillType": $("#BillType").val()
+
+                    , "HDeptID": dataArray[0].HDeptID
+                    , "HDeptName": dataArray[0].閮ㄩ棬
+                    , "HManagerID": dataArray[0].HManagerID
+                    , "HManagerName": dataArray[0].涓荤
+                    , "HWHID": dataArray[0].HWHID
+                    , "HWHName": dataArray[0].浠撳簱
+                    , "HEmpID": dataArray[0].HEmpID
+                    , "HEmpName": dataArray[0].涓氬姟鍛�
+                    , "HSupID": dataArray[0].HSupID
+                    , "HSupName": dataArray[0].渚涘簲鍟�
+                    , "HCurID": dataArray[0].HCurID
+                    , "HCurName": dataArray[0].甯佸埆
+                    , "HExRate": dataArray[0].姹囩巼
+                    , "HAddress": dataArray[0].浜よ揣鍦扮偣
+                    , "HRemark": dataArray[0].琛ㄥご澶囨敞
+                    , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
+                    , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+                    , "HProjectNumber": dataArray[0].椤圭洰浠g爜
+                    , "HProjectID": dataArray[0].HProjectID
+
+                });
+
+                //瀛愯〃  璧嬪��
+                var rowdata = [];
+                for (var i = 0; i < dataArray.length; i++) {
+                    rowdata.push(
+                        {
+                            "HMaterID": dataArray[i].HMaterID
+                            , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                            , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                            , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                            , "HUnitID": dataArray[i].HUnitID
+                            , "璁¢噺鍗曚綅": dataArray[i].璁¢噺鍗曚綅
+                            , "HWHID": dataArray[i].HWHID
+                            , "鏀舵枡浠撳簱": dataArray[i].浠撳簱鍚嶇О
+                            , "HSPID": dataArray[i].HSPID
+                            , "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
+                            , "HSecUnitID": dataArray[i].HSecUnitID
+                            , "杈呭姪鍗曚綅": dataArray[i].杈呭姪鍗曚綅
+                            , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+                            , "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
+                            , "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                            , 'HDiscountRate': dataArray[i].鎶樻墸鐜�                                                    //
+                            , "HTaxRate": dataArray[i].绋庣巼
+                            , 'HTaxMoney': dataArray[i].绋庨                                                     //
+                            , "HMoney": dealDoubleToFixed(dataArray[i].閲戦, 2)
+                            , "HRemark": dataArray[i].琛ㄤ綋澶囨敞
+
+                            , "HSourceInterID": dataArray[i].hmainid
+                            , "HSourceEntryID": dataArray[i].hsubid
+                            , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                            , "HSourceBillType": dataArray[i].HBillType
+                            , "HRelationQty": "0"
+                            , "HRelationMoney": "0"
+
+                            , 'HPOOrderInterID': "0"
+                            , 'HPOOrderEntryID': "0"
+                            , 'HPOOrderBillNo': ""
+
+                            , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+                            , "HSeOrderInterID": dataArray[i].hmainid
+                            , "HSeOrderEntryID": dataArray[i].hsubid
+                            , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                        }
+                    );
+                }
+                option.data = rowdata;
+                table.render(option);
+            }
+
+            //#endregion
+
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //var sMainStr = JSON.stringify(data.field);
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                checkDuplicateData(num);
+                const duplicateRows = checkDuplicateData(num);
+                if (duplicateRows.length > 0) {
+                    let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+
+                    for (let i = 0; i < duplicateRows.length; i++) {
+                        const { row1, row2 } = duplicateRows[i];
+                        message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+
+                        if (i !== duplicateRows.length - 1) {
+                            message += '锛�';
+                        }
+                    }
+
+                    message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+                    layer.alert(message);
+                    return;
+                }
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var sAllStr = JSON.stringify(allVal);
+                //var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Cg_POInStockBill/POInStockBillEdit", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            if (data.Verify == "Y") //鑷姩瀹℃牳
+                            {
+                                $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                                set_CheckBill(0);
+                            }
+                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');//鎵撳嵃鏍煎紡
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+
+            //#region 鏁版嵁鏍¢獙
+            function AllowLoadData(data) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^-?\d+(\.\d+)?$/;          //鍒ゆ柇瀛楃涓叉槸鍚︿负鏁板瓧(鍖呭惈鏁存暟銆佹诞鐐规暟)锛屾鍒欒〃杈惧紡
+                var temp = "";
+
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                if ($("#HDeptID").val() == "0" || $("#HDeptID").val() == "") {
+                    layer.msg("閮ㄩ棬鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HEmpID").val() == "0" || $("#HEmpID").val() == "") {
+                    layer.msg("涓氬姟鍛樻湭閫夋嫨!");
+                    return false;
+                }
+
+                //if ($("#HManagerID").val() == "0") {
+                //    layer.msg("涓荤鏈�夋嫨!");
+                //    return false;
+                //}
+
+                if ($("#HWHID").val() == "0") {
+                    layer.msg("浠撳簱鏈�夋嫨!");
+                    return false;
+                }
+
+                if ($("#HSupID").val() == "0") {
+                    layer.msg("渚涘簲鍟嗘湭閫夋嫨!");
+                    return false;
+                }
+
+                if ($("#HCurID").val() == "0") {
+                    layer.msg("甯佸埆鏈�夋嫨!");
+                    return false;
+                }
+
+                temp = $("#HExRate").val() + "";
+                if (temp == 0) {
+                    layer.msg("姹囩巼涓嶈兘涓�0!");
+                    return false;
+                } else if (!ref.test(temp)) {
+                    layer.msg("姹囩巼璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                    return false;
+                }
+                //#endregion
+
+                //#region 瀛愯〃 鏁版嵁妫�楠�
+                for (var i = 0; i < option.data.length; i++) {
+
+                    if (typeof option.data[i] !== 'object' || option.data[i] === null || Array.isArray(option.data[i])) {
+                        continue; // 璺宠繃闈炲璞¢」锛堝绌烘暟缁勶級
+                    }
+
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鐗╂枡鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    if (option.data[i]["HUnitID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璁¢噺鍗曚綅鏈�夋嫨锛�");
+                        return false;
+                    }
+
+                    //鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (!ref1.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
+                        return false;
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPrice"] + "";
+                    if (temp == "0") {
+                        //layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环涓嶈兘涓�0锛�");
+                        //return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //鍚◣鍗曚环鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxPrice"] + "";
+                    if (temp == "0") {
+                        //layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环涓嶈兘涓�0锛�");
+                        //return false;
+                    } else if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鍚◣鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    //绋庣巼鏍煎紡鏍¢獙
+                    temp = option.data[i]["HTaxRate"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒");
+                        return false;
+                    }
+
+                    ////閲戦鏍煎紡鏍¢獙
+                    //temp = option.data[i]["HMoney"] + "";
+                    //if (temp == "0") {
+                    //    //layer.msg("绗�" + (i + 1) + "琛岋細閲戦涓嶈兘涓�0锛�");
+                    //    //return false;
+                    //} else if (!ref.test(temp)) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
+                    //    return false;
+                    //}
+
+
+
+                    //鏀舵枡浠撳簱闈炵┖楠岃瘉
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細鏀舵枡浠撳簱鏈�夋嫨锛�");
+                        return false;
+                    }
+                }
+                //#endregion
+                return true;
+            }
+            //#endregion
+
+            //涓氬姟鍛�
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //渚涘簲鍟�
+            function get_checkSup() {
+                var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //浠撳簱
+            function get_checkWH() {
+                var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+
+
+                        if (option.data.length > 0) {
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (option.data[i]["HWHID"] == 0) {
+                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+                                    option.data[i]["鏀舵枡浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+                                }
+                            }
+                        }
+                        table.render(option);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //璐у竵
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '甯佸埆鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+            //宸ョ▼椤圭洰
+            function get_btnHProjectID() {
+                var HOrgID = $("#HOrgID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '椤圭洰鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../椤圭洰绠$悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+                        $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+                        $("#HProjectID").val(checkStatus.data[0].HInterID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //閮ㄩ棬
+            function get_checkDept() {
+                var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, '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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //涓荤
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓荤鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var InterID = $("#HInterID").val();
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cg_POInStockBill/AuditCg_POInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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);
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+
+            //琛屽唴蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    //#region 瀛愯〃鏂囨湰妗嗚緭鍏ュ悗妫�绱㈡暟鎹�
+                    if (event.key != "F7") {
+                        var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
+                        if (obj.event == "HMaterID") {                           //瀹氫綅褰撳墠姝e湪杈撳叆鐨勬枃鏈鐨勫垪鍚�
+                            if ($.inArray(event.key, errKeys) == -1) {              //濡傛灉鎸変笅鐨勯敭浣嶄笉鏄� 鏂瑰悜閿紝鍒欏埛鏂板脊绐椾腑鐨勬暟鎹�
+                                if (childPage == null) {                            //鍒ゆ柇褰撳墠瀛愮獥鍙f槸鍚﹀凡缁忔墦寮�锛岃嫢鏈墦鍗★紝鍒欐墦寮�椤甸潰锛屽苟鑾峰彇瀛愮獥鍙g殑瀵硅薄
+                                    var offset = $(this).offset();                  //鑾峰彇瑙﹀彂浜嬩欢鐨勫厓绱犵殑浣嶇疆锛岀敤浜庡畾浣嶅瓙绐楀彛鎵撳紑鐨勪綅缃�
+                                    var innerHeight = window.innerHeight;
+                                    var top = offset.top + 0.05 * innerHeight;
+                                    var left = offset.left;
+                                    if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
+                                        top = top - 0.3 * innerHeight - 0.05 * innerHeight;
+                                    }
+                                    layer.open({
+                                        type: 2                                                                                     //寮圭獥绫诲瀷
+                                        , skin: 'layui-layer-rim'                                                                   //鍔犱笂杈规
+                                        , area: ['25%', '30%']                                                                      //澶у皬
+                                        , shadeClose: true                                                                          //鐐瑰嚮閬僵鏃跺叧闂脊绐�
+                                        , offset: [top, left]
+                                        , title: false                                                                              //涓嶆樉绀烘爣棰樻爮
+                                        //, title: '椤圭洰璐圭敤鍒楄〃'                                                                     //鏍囬
+                                        , shift: 2                                                                                  //寮瑰嚭鍔ㄧ敾
+                                        , closeBtn: 0                                                                               //绂佺敤鍏抽棴鎸夐挳
+                                        , content: ["../../鍩虹璧勬枡/閫氱敤鍩虹璧勬枡/Gy_CommonBaseData.html?OperationType=2", "yes"]
+                                        , success: function (layero, index) {
+                                            setTimeout(function () {
+                                                var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                                currRowIndex = 0;
+                                                var tableView = "h_v_Gy_MaterialList";
+                                                var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%') order by 鐗╂枡浠g爜 desc";
+                                                childPage.getData(childSWhere, tableView);
+                                            }, 200);
+                                        }
+                                        , end: function () {
+                                            obj.event = "";
+                                            childPage = null;
+                                            currRowIndex = 0;
+                                            if (childData != null) {
+                                                OptionData = childData;
+
+                                                //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                                                var HSupID = $("#HSupID").val();
+                                                if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                                    var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                                    var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                                    var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                                    var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                                    $.ajax({
+                                                        url: GetWEBURL() + "/Gy_Supplier/xg",
+                                                        //url: "http://localhost:12761/Gy_Supplier/xg",
+                                                        type: "GET",
+                                                        data: {
+                                                            "HInterID": HSupID
+                                                        },
+                                                        success: function (d) {
+                                                            var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                                            //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                                            var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                                            var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                                            var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                                            var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                                            var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                                            //鏁板瓧绮惧害
+                                                            HQty = Number(HQty.toFixed(HQtyDec));
+                                                            HPrice = Number(HPrice.toFixed(HPriceDec));
+                                                            HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                                            HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                                            HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                                , "HUnitID": OptionData.HUnitID
+                                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                                , "HTaxRate": HTaxRate * 100
+                                                                , "HQty": HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                                                , "HPrice": HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                                                , "HMoney": HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                                                , "HTaxMoney": HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                                                , "HTaxPrice": HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                                            })
+                                                        }
+                                                    });
+                                                } else if (typeof (OptionData.HItemID) != "undefined") {
+                                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                        , "HUnitID": OptionData.HUnitID
+                                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                    })
+                                                }
+
+                                                OptionData = {};
+                                                childData = null;
+                                            }
+                                        }
+                                    });
+                                } else {
+                                    setTimeout(function () {
+                                        var value = $(e.currentTarget).val().replace("'", "");                                  //鑾峰彇鏂囨湰妗嗘渶鏂板��
+                                        currRowIndex = 0;
+                                        var tableView = "h_v_Gy_MaterialList";
+                                        var childSWhere = "select top(10) HItemID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,HUnitID,璁¢噺鍗曚綅鍚嶇О from " + tableView + " where 1=1 and 缁勭粐鍚嶇О = '" + sessionStorage["Organization"] + "' and (鐗╂枡浠g爜 like '%" + value + "%' or 鐗╂枡鍚嶇О like '%" + value + "%')  order by 鐗╂枡浠g爜 desc";
+                                        childPage.getData(childSWhere, tableView);
+                                    }, 200);
+                                }
+                            } else {                                                    //濡傛灉鎸変笅鐨勯敭浣嶆槸 鏂瑰悜閿紝鍒欒皟鏁寸獥鍙d腑 閫変腑琛� 鐨勪綅缃�
+                                if (event.key == "ArrowUp") {
+                                    currRowIndex--;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "ArrowDown") {
+                                    currRowIndex++;
+                                    childPage.setSelectedRow(currRowIndex);
+                                } else if (event.key == "Enter") {
+                                    //鎵嬪姩澶辩劍
+                                    var element = document.getElementById("HBillNo");
+                                    element.focus();
+
+                                    childPage.getSelectedData(currRowIndex);
+
+
+                                    if (childData != null) {
+                                        OptionData = childData;
+
+                                        //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                                        var HSupID = $("#HSupID").val();
+                                        if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                            var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                            var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                            var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                            var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                            $.ajax({
+                                                url: GetWEBURL() + "/Gy_Supplier/xg",
+                                                //url: "http://localhost:12761/Gy_Supplier/xg",
+                                                type: "GET",
+                                                data: {
+                                                    "HInterID": HSupID
+                                                },
+                                                success: function (d) {
+                                                    var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                                    //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                                    var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                                    var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                                    var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                                    var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                                    var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                                    //鏁板瓧绮惧害
+                                                    HQty = Number(HQty.toFixed(HQtyDec));
+                                                    HPrice = Number(HPrice.toFixed(HPriceDec));
+                                                    HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                                    HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                                    HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                                    obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                        "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                        , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                        , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                        , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                        , "HUnitID": OptionData.HUnitID
+                                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                        , "HTaxRate": HTaxRate * 100
+                                                        , "HQty": HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                                        , "HPrice": HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                                        , "HMoney": HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                                        , "HTaxMoney": HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                                        , "HTaxPrice": HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                                    })
+                                                }
+                                            });
+                                        } else if (typeof (OptionData.HItemID) != "undefined") {
+                                            obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                , "HUnitID": OptionData.HUnitID
+                                                , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                            })
+                                        }
+
+                                        OptionData = {};
+                                        childData = null;
+                                    }
+
+                                    childPage = null;
+                                    currRowIndex = 0;
+                                    childData = null;
+                                    obj.event = "";
+                                }
+                            }
+                        }
+
+                    }
+                    //#endregion
+
+
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            var HOrgID = $("#HOrgID").val();  //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+                            layer.open({  //鎵撳紑灞�
+                                type: 2         // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe       绫诲瀷涓�2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']   //椤甸潰鍔犺浇
+                                , btn: ["纭畾", "鍙栨秷"]  //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+                                , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                                    var TaxRate = getHTaxRateByHSupID();
+                                    if (checkStatus.data.length > 1) {
+                                        var rowIndex = $(obj.tr).attr("data-index") * 1;
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            if (rowIndex + i >= option.data.length) {
+                                                var NewRow = {
+                                                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                                                    "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": "", "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
+                                                    , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
+                                                };
+
+                                                table.cache["mainTable"].push(NewRow);
+                                                option.data = table.cache["mainTable"];
+
+                                                table.render(option);
+                                            }
+                                            var HMaterID = checkStatus.data[i].HItemID;
+                                            var resultData = getMaterialByMaterID(HMaterID);
+                                            option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+                                            option.data[rowIndex + i].鐗╂枡浠g爜 = resultData.HMaterNumber;
+                                            option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+                                            option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+                                            option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+                                            option.data[rowIndex + i].璁¢噺鍗曚綅 = resultData.HUnitName;
+                                            option.data[rowIndex + i].HTaxRate = TaxRate;
+                                            ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                            //obj.update({
+                                            //    "HMaterID": checkStatus.data[0].HItemID
+                                            //    , "鐗╂枡浠g爜": checkStatus.data[0].HNumber
+                                            //    , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+                                            //    , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                            //    , "HUnitID": checkStatus.data[0].HUnitID
+                                            //    , "璁¢噺鍗曚綅": checkStatus.data[0].HUnitName
+                                            //})
+                                            //layer.close(index);//鍏抽棴寮圭獥
+                                        }
+                                        table.render(option);
+                                    }
+                                    layer.closeAll();  //鍏抽棴鎵�鏈夐�氳繃layer
+                                    //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {   //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                    //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                                    var HSupID = $("#HSupID").val();
+                                    if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                        var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                        var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                        var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                        var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                        $.ajax({
+                                            url: GetWEBURL() + "/Gy_Supplier/xg",
+                                            //url: "http://localhost:12761/Gy_Supplier/xg",
+                                            type: "GET",
+                                            data: {
+                                                "HInterID": HSupID
+                                            },
+                                            success: function (d) {
+                                                var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                                //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                                var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                                var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                                var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                                var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                                var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                                //鏁板瓧绮惧害
+                                                HQty = Number(HQty.toFixed(HQtyDec));
+                                                HPrice = Number(HPrice.toFixed(HPriceDec));
+                                                HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                                HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                                HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                                obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                                    "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                                    , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                                    , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                                    , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                                    , "HUnitID": OptionData.HUnitID
+                                                    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                                    , "HTaxRate": HTaxRate * 100
+                                                    , HQty: HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                                    , HPrice: HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                                    , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                                    , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                                    , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                                })
+                                            }
+                                        });
+                                    } else if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                            "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                        })
+                                    }
+
+                                }
+                            });
+                        }
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    OptionData = checkStatus.data[0];
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                        , "HUnitID": checkStatus.data[0].HItemID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HUnitID": OptionData.HItemID
+                                        , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //鏀舵枡浠撳簱
+                        if (obj.event == "HWHID") {
+                            var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鏀舵枡浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "鏀舵枡浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                        , "HWHID": checkStatus.data[0].HItemID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HItemID
+                                        , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //浠撲綅鍚嶇О
+                        if (obj.event == "HSPID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
+                                        , "HSPID": checkStatus.data[0].HMainID
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HSPID": OptionData.HMainID
+                                        , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //杈呭姪鍗曚綅
+                        if (obj.event == "HSecUnitID") {
+                            var HOrgName = $('select[name="HOrgID"] option:selected').text();
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "杈呭姪鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit&HOrgName=' + HOrgName, 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HSecUnitID": checkStatus.data[0].HItemID
+                                        , "杈呭姪鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HSecUnitID": OptionData[0].HItemID
+                                        , "杈呭姪鍗曚綅": OptionData[0].璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+
+                })
+
+                $('.layui-table-box tbody td[data-field="鐗╂枡浠g爜"]').off('dblclick').on('dblclick', function () {
+                    //鎵嬪姩澶辩劍
+                    var element = document.getElementById("HBillNo");
+                    element.focus();
+
+                    var HOrgID = $("#HOrgID").val();  //鑾峰彇id="HOrgID"鐨勫厓绱犱腑鑾峰彇鍏跺�硷紝骞跺皢璇ュ�煎瓨鍌ㄥ湪鍙橀噺HOrgID涓�
+                    layer.open({  //鎵撳紑灞�
+                        type: 2         // //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe       绫诲瀷涓�2
+                        , skin: "layui-layer-rim" //鍔犱笂杈规
+                        , title: "鐗╂枡鍒楄〃"  //鏍囬
+                        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                        , shift: 2 //寮瑰嚭鍔ㄧ敾
+                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']   //椤甸潰鍔犺浇
+                        , btn: ["纭畾", "鍙栨秷"]  //灞炴�у畾涔変簡寮瑰嚭灞備笂鐨勬寜閽暟鈥滅‘瀹氣�濆拰鈥滃彇娑�
+                        , btn1: function (index, laero) { //褰撶偣鍑烩�滅‘瀹氣�濇寜閽椂浼氳璋冪敤
+                            //鎸夐挳涓�  鐨勫洖璋�
+                            var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                            OptionData = checkStatus.data[0];  //鎶婇�変腑鏁版嵁鐨勭涓�鏉¤祴鍊肩粰OptionData鍙橀噺
+                            var TaxRate = getHTaxRateByHSupID();
+                            if (checkStatus.data.length > 1) {
+                                var rowIndex = $(obj.tr).attr("data-index") * 1;
+                                for (var i = 0; i < checkStatus.data.length; i++) {
+                                    if (rowIndex + i >= option.data.length) {
+                                        var NewRow = {
+                                            "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                                            "HSPID": 0, "浠撲綅鍚嶇О": "", "HSecUnitID": "", "杈呭姪鍗曚綅": "", "HQty": "0", "HRemark": ""
+                                            , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HTaxRate": "0", "HTaxMoney": "0"
+                                        };
+
+                                        table.cache["mainTable"].push(NewRow);
+                                        option.data = table.cache["mainTable"];
+
+                                        table.render(option);
+                                    }
+                                    var HMaterID = checkStatus.data[i].HItemID;
+                                    var resultData = getMaterialByMaterID(HMaterID);
+                                    option.data[rowIndex + i].HMaterID = resultData.HMaterID;
+                                    option.data[rowIndex + i].鐗╂枡浠g爜 = resultData.HMaterNumber;
+                                    option.data[rowIndex + i].鐗╂枡鍚嶇О = resultData.HMaterName;
+                                    option.data[rowIndex + i].瑙勬牸鍨嬪彿 = resultData.HMaterModel;
+                                    option.data[rowIndex + i].HUnitID = resultData.HUnitID;
+                                    option.data[rowIndex + i].璁¢噺鍗曚綅 = resultData.HUnitName;
+                                    option.data[rowIndex + i].HTaxRate = TaxRate;
+                                    ////鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    //obj.update({
+                                    //    "HMaterID": checkStatus.data[0].HItemID
+                                    //    , "鐗╂枡浠g爜": checkStatus.data[0].HNumber
+                                    //    , "鐗╂枡鍚嶇О": checkStatus.data[0].HName
+                                    //    , "瑙勬牸鍨嬪彿": checkStatus.data[0].HModel
+                                    //    , "HUnitID": checkStatus.data[0].HUnitID
+                                    //    , "璁¢噺鍗曚綅": checkStatus.data[0].HUnitName
+                                    //})
+                                    //layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                table.render(option);
+                            }
+                            layer.closeAll();  //鍏抽棴鎵�鏈夐�氳繃layer
+                            //layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {   //褰撶偣鍑烩�滃彇娑堚�濇寜閽椂浼氳璋冪敤
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+                            //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                            var HSupID = $("#HSupID").val();
+                            if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
+                                var Dec = getDecByMaterID(obj.data.HMaterID) //鑾峰彇绮惧害
+                                var HQtyDec = (Dec["HQtyDec"] == null || Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"];  //鏁伴噺绮惧害
+                                var HPriceDec = (Dec["HPriceDec"] == null || Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"];  //鍗曚环绮惧害
+                                var HMoneyDec = (Dec["HMoneyDec"] == null || Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"];  //閲戦绮惧害
+                                $.ajax({
+                                    url: GetWEBURL() + "/Gy_Supplier/xg",
+                                    //url: "http://localhost:12761/Gy_Supplier/xg",
+                                    type: "GET",
+                                    data: {
+                                        "HInterID": HSupID
+                                    },
+                                    success: function (d) {
+                                        var HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�) * 0.01;
+                                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                                        var HQty = obj.data.HQty * 1;                           //鏁伴噺
+                                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+                                        var HTaxMoney = Number((HMoney * HTaxRate));         //绋庨=閲戦*绋庣巼
+                                        var HTaxPrice = Number((HPrice * (1 + HTaxRate)));        //鍚◣鍗曚环=鍗曚环*(1+绋庣巼)
+                                        //鏁板瓧绮惧害
+                                        HQty = Number(HQty.toFixed(HQtyDec));
+                                        HPrice = Number(HPrice.toFixed(HPriceDec));
+                                        HMoney = Number(HMoney.toFixed(HMoneyDec));
+                                        HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
+                                        HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
+                                        obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                            "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                            , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                            , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                            , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                            , "HUnitID": OptionData.HUnitID
+                                            , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                            , "HTaxRate": HTaxRate * 100
+                                            , HQty: HQty                               //鏇存柊HQty瀛楁锛孒Qty
+                                            , HPrice: HPrice                         //鏇存柊HPrice瀛楁锛孒Price
+                                            , HMoney: HMoney                      //鏇存柊HMoney瀛楁锛孒Money
+                                            , HTaxMoney: HTaxMoney                  //鏇存柊HTaxMoney瀛楁锛孒TaxMoney
+                                            , HTaxPrice, HTaxPrice                   //鏇存柊HTaxPrice瀛楁锛孒TaxPrice
+                                        })
+                                    }
+                                });
+                            } else if (typeof (OptionData.HItemID) != "undefined") {
+                                obj.update({ //鏇存柊琛ㄦ牸鏁版嵁
+                                    "HMaterID": OptionData.HItemID             //璁剧疆HItemID鐨勫�间负鈥淗BillNo鈥濆瓧娈电殑鍊糎ItemID`鐨勫��
+                                    , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                    , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                    , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                    , "HUnitID": OptionData.HUnitID
+                                    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                })
+                            }
+
+                        }
+                    });
+
+                    obj.event = "";
+                });
+            }
+
+            //鍔ㄦ�佸脊鍑洪〉闈�
+            function getSupType() {
+                var type = $("#HSourceBillType").val();
+                var data = [];
+                //鑾峰彇缂栫爜瀵瑰簲鍗曟嵁鍚嶇О
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    data: { "HBillType": type },
+                    url: GetWEBURL() + "/Web/GetHSourceBillName",
+                    success: function (result) {
+                        data = result.data;
+                    }
+                })
+                switch (type) {
+                    case '1102':
+                        return { url: "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html", name: data[0]["HName"] };
+                        break;
+                }
+
+            }
+
+            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+                var HOrgID = $("#HOrgID").val();
+                var url = "";
+                if ($("#HSourceBillType").val() == "1102") {
+                    url = "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html?openType=2&HOrgID=" + HOrgID;
+                } else {
+                    return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟閫夋嫨锛侊紒');
+                }
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: '' + getSupType().name + '鍒楄〃'  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [url, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length == 0) {
+                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+                        }
+                        var HSupID = $("#HSupID").val();//鍒ゆ柇渚涘簲鍟�
+                        if (HSupID == 0 || HSupID == '') {
+                            HSupID = checkStatus.data[0]["HSupID"];
+                        }
+                        //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+                        //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
+                        var ProcessNumber = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HSupID"] != HSupID) {
+                                layer.msg("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓渚涘簲鍟�!");
+                                layer.close(index);//鍏抽棴寮圭獥
+                                return;
+                            }
+                            ProcessNumber.push(checkStatus.data[i]);
+                        }
+
+                        //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                        var NowNum = 0;
+                        NowNum = option.data.length;
+
+                        if ($("#HSourceBillType").val() == "1102") {
+                            $("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
+                            $("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠g爜);
+                            $("#HProjectID").val(checkStatus.data[0].HProjectID);
+                            $("#HDeptID").val(checkStatus.data[0].HDeptID);
+                            $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+                            $("#HManagerID").val(checkStatus.data[0].HManagerID);
+                            $("#HManagerName").val(checkStatus.data[0].涓荤);
+                            $("#HWHID").val(checkStatus.data[0].HWHID);
+                            $("#HWHName").val(checkStatus.data[0].浠撳簱);
+                            $("#HEmpID").val(checkStatus.data[0].HEmpID);
+                            $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+                            $("#HSupID").val(checkStatus.data[0].HSupID);
+                            $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+                            $("#HCurID").val(checkStatus.data[0].HCurID);
+                            $("#HCurName").val(checkStatus.data[0].甯佸埆);
+                            $("#HExRate").val(checkStatus.data[0].姹囩巼);
+                            $("#HAddress").val(checkStatus.data[0].浜よ揣鍦扮偣);
+                            $("HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿)
+
+                            var j = 0;
+                            for (var i = 0; i < ProcessNumber.length; i++) {
+                                option.data.push({
+                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
+                                    "HQty": checkStatus.data[j].鏁伴噺 - checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
+                                    "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�,
+                                    "HWHID": checkStatus.data[j].HWHIDSub, "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О, "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HSecUnitID": checkStatus.data[j].HSecUnitID, "杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                })
+                                j++;
+                            }
+                            table.render(option);
+                            layer.close(index);//鍏抽棴寮圭獥
+                            //setInitByPOOrderBill(checkStatus);
+                        }
+                    }
+
+                });
+            });
+
+            //鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
+            function checkDuplicateData(data) {
+                const duplicates = [];
+
+                for (let i = 0; i < data.length; i++) {
+                    const currentItem = data[i];
+                    let isDuplicate = false;
+
+                    for (let j = i + 1; j < data.length; j++) {
+                        const compareItem = data[j];
+                        //涓诲瓙id
+                        if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
+                            isDuplicate = true;
+                            duplicates.push({ row1: i + 1, row2: j + 1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁�
+                        }
+                    }
+                    if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
+                        duplicates.push({ row1: i + 1, row2: -1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁帮紝-1 琛ㄧず鏈壘鍒颁笌褰撳墠琛岄噸澶嶇殑琛�
+                    }
+                }
+                return duplicates;
+            }
+            //#region 鏍规嵁鐗╂枡ID鑾峰彇绮惧害
+            function getDecByMaterID(HMaterID) {
+                var resultData = {};
+                $.ajax({  // 寮傛璇锋眰
+                    url: GetWEBURL() + "Gy_Material/getDecByID",  //璇锋眰鍦板潃
+                    async: false,   //鏄惁寮�鍚紓姝�
+                    type: "GET",   //璇锋眰绫诲瀷
+                    data: {   //瀹氫箟鍙戦�佸埌鏈嶅姟鍣ㄧ殑鏁版嵁
+                        "HMaterID": HMaterID     //  灏唄materid浣滀负璇锋眰鍙傛暟鍙戦��
+                    },
+                    success: function (result) {   // 褰撹姹傛垚鍔熸椂锛屾墽琛岃繖涓嚱鏁�
+                        if (result.code == 1) { // 濡傛灉鏈嶅姟鍣ㄨ繑鍥炵殑鏁版嵁涓殑`code瀛楁绛変簬1锛岃繖鍙兘琛ㄧず瀹℃牳鎿嶄綔鎴愬姛鎵ц
+                            var data = result.data; //澹版槑data鍙橀噺锛屽苟灏嗗叾璧嬪�间负result瀵硅薄涓殑data灞炴��
+                            resultData = data[0];   //灏哾ata鏁扮粍锛堟垨绫绘暟缁勫璞★級鐨勭涓�涓厓绱犺祴鍊肩粰鍙橀噺resultData
+                        }
+                        //else {
+                        //    layer.alert(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' }); //result.msg瀵硅薄锛屾彁绀哄脊绐� 绫诲瀷涓�5锛� 鎸夐挳锛屽拰鎸夐挳鐨勫悕绉颁负閫�鍑�  鏃堕棿 涓�100绉掞紝浠ュ強鍋忕Щ閲忥紙`offset: 't'
+                        //}
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });  //鎻愮ず寮圭獥 鍙戠敓閿欒 锛岃绀烘爣蹇椾负5鐨�
+                    }
+                });
+                return resultData;
+            }
+            //#endregion
+
+            //#region 鏍规嵁鐗╂枡ID鑾峰彇鐗╂枡璇︾粏淇℃伅
+            function getMaterialByMaterID(HMaterID) {
+                var resultData = {};
+                $.ajax({
+                    url: GetWEBURL() + "Cg_POInStockBill/getMaterialByMaterID",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HMaterID": HMaterID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) {
+                            var data = result.data;
+                            resultData = data[0];
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return resultData;
+            }
+            //#endregion
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();//婧愮爜鍒犻櫎琛屾槸璧嬪��={}
+
+                            table.cache["mainTable"].splice(rowIndex, 1); //浠庣紦瀛橀噷鍒犻櫎琛屾暟鎹�
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+                var colTitleName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colTitleName += option.cols[0][i]["title"] + ",";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            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 titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            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 (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鑾峰彇婧愬崟绫诲瀷
+            function HSourceBillType() {
+                var HName = '鏀舵枡閫氱煡鍗�';
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    data: { "HName": HName, "Num": 2 },       //0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+                    url: GetWEBURL() + "/Web/GetHSourceBillType",
+                    success: function (result) {
+                        var HSourceBillTypes = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                HSourceBillTypes += '<option  style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
+                            }
+                            $("#HSourceBillType").append(HSourceBillTypes);
+                            form.render('select');
+                        }
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+            function getHTaxRateByHSupID() {
+                var HTaxRate;
+                //閫氳繃渚涘簲鍟唅d鑾峰彇绋庣巼
+                var HSupID = $("#HSupID").val();
+                if (HSupID != 0) {
+                    $.ajax({
+                        url: GetWEBURL() + "/Gy_Supplier/xg",
+                        type: "GET",
+                        async: false,
+                        data: {
+                            "HInterID": HSupID
+                        },
+                        success: function (d) {
+                            HTaxRate = parseInt(d.data[0].澧炲�肩◣鐜�);
+                        }
+                    });
+                } else {
+                    HTaxRate = 0;
+                }
+                return HTaxRate;
+            }
+            //#endregion
+
+            //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐鍗曟暟鎹�
+            function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
+                var res = "none";
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HInterID": HSourceInterID
+                        , "HSubID": HSourceEntryID
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            res = result.data[0];
+                        } else {
+                            res = result.data;
+                            //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+
+            //#region 鑾峰彇鏈崟鍗曟嵁鐘舵��
+            function getSourceBillStatus_POInStockBill() {
+                var HSourceBillData = "none";
+                var sWhere = " and hmainid = " + $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + '/Cg_POInStockBill/list',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            HSourceBillData = data1.data;
+                        } else {
+                            layer.alert(data1.code + "鍗曟嵁鐘舵�佸垽鏂け璐ワ紒", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return HSourceBillData;
+            }
+            //#endregion
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        // 鍩虹璧勬枡杩斿洖鏁版嵁
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+
+        function GetHSupNameValue(obj)  //杩斿洖渚涘簲鍟�
+        {
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+            if (option.data.length > 0) {
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HWHID"] == 0 || option.data[i]["鏀舵枡浠撳簱"] == undefined) {
+                        option.data[i]["HWHID"] = obj[0].HItemID;
+                        option.data[i]["鏀舵枡浠撳簱"] = obj[0].浠撳簱鍚嶇О;
+                    }
+                }
+            }
+            layui.table.render(option);
+        }
+
+
+        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+
+        function GetHManagerValue(obj)  //杩斿洖涓荤
+        {
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
+
+
+        //鍙屽嚮杩斿洖鐗╂枡
+        function GetGyMaterial(data) {
+            OptionData = data
+        }
+        //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+        function GetUnitValue(data) {
+            OptionData = data[0]
+        }
+
+        //鍙屽嚮杩斿洖鏀舵枡浠撳簱
+        function GetGyWarehouse(data) {
+            OptionData = data[0];
+        }
+
+
+        //鍙屽嚮杩斿洖鏀舵枡浠撲綅
+        function GetGyStockPlace(data) {
+            OptionData = data
+        }
+
+        //鍙屽嚮杩斿洖杈呭姪鍗曚綅
+        function GetAuxiliaryUnitValue(data) {
+            OptionData = data
+        }
+        //鍙屽嚮杩斿洖璐у竵
+        function GetGyCur(data) {
+            OptionData = data
+        }
+        //椤圭洰
+        function GetProjectBillValue(data) {
+            $("#HProjectName").val(data[0].椤圭洰鍚嶇О);
+            $("#HProjectNumber").val(data[0].椤圭洰浠g爜);
+            $("#HProjectID").val(data[0].HInterID);
+        }
+
+        //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+        function dealDoubleToFixed(data, num) {
+            //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+            var dotLength = 0;
+
+            if (num == 1) {                                    //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+                dotLength = 6;
+            } else if (num == 2) {                             //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+                dotLength = 2;
+            } else if (num == 3) {                             //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+                dotLength = 4;
+            }
+
+            //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+            data = data + "";
+            var index = data.indexOf(".");
+
+            //澶勭悊鏁版嵁骞惰繑鍥�
+            if (index < 0) {
+                return data * 1;
+            } else {
+                //鑾峰彇灏忔暟浣嶆暟
+                var length = data.length - index - 1;
+                if (length <= dotLength) {
+                    return data * 1;
+                } else {
+                    data = data * 1;
+                    return data.toFixed(dotLength);
+                }
+            }
+        }
+                //#endregion
+    </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/\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 47cc7c4..74b8a6f 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"
@@ -415,7 +415,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲                       
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , content: '../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList_TestByLLJ.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
 
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
@@ -1440,6 +1440,9 @@
                 if (HMangerID) {
                     sWhere += " and 涓荤 like '%" + HMangerID + "%'";
                 }
+                if (HOrgID) {
+                    sWhere += " and HOrgID like '%" + HOrgID + "%'";
+                }
                 //sWhere += " and 鍏抽棴浜� =''";
                 sWhere += addSWhereByOpenType();
                 get_DisplayPage(sWhere);
@@ -2102,7 +2105,7 @@
                         , title: "鏉ユ枡妫�楠屽崟"  //鏍囬
                         , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
                         , shift: 2 //寮瑰嚭鍔ㄧ敾
-                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , area: ["100%", "100%"] //绐椾綋澶у皬
                         , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                         , content: ['../../璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=2&linterid=' + data[0].hmainid + '&HSouceBillType='+data[0].HBillType + '&HICMOEntryID=&HEntryID='+ data[0].hsubid, "yes"]
                     })
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 957f41a..617caeb 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"
@@ -2818,7 +2818,7 @@
                         , title: "鏉ユ枡妫�楠屽崟"  //鏍囬
                         , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
                         , shift: 2 //寮瑰嚭鍔ㄧ敾
-                        , area: ["90%", "90%"] //绐椾綋澶у皬
+                        , area: ["100%", "100%"] //绐椾綋澶у皬
                         , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                         , content: ['../../璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html?OperationType=2&linterid=' + data[0].hmainid + '&HSouceBillType='+data[0].HBillType + '&HICMOEntryID=&HEntryID='+ data[0].hsubid, "yes"]
                     })
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 94c2700..8f9df81 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"
@@ -46,7 +46,7 @@
                                     <label class="layui-form-label">鏃ユ湡闂撮殧</label>
                                     <div class="layui-input-block">
                                         <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
-                                            lay-filter="HInitTimeCycle" style="width:190px;">
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
                                 </div>
@@ -54,34 +54,43 @@
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
-                                            style="width:190px;">
+                                               style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
                                         <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
-                                            style="width:190px;">
+                                               style="width:190px;">
                                     </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" style="width:190px;">
+                                               id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <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">
+                                        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>
+                                        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>
+                                         id="HFilterScheme_Now"></div>
                                 </div>
                                 <div class="layui-colla-content">
                                     <div class="layui-row" style="margin-top:5px">
@@ -89,29 +98,33 @@
                                             <label class="layui-form-label">涓氬姟鍛�</label>
                                             <div class="layui-input-block">
                                                 <input type="text" class="layui-input ForFilteringSchemes"
-                                                    name="HEmpName" id="HEmpName" style="width:190px;">
+                                                       name="HEmpName" id="HEmpName" style="width:190px;">
                                             </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="HSupName" id="HSupName" style="width:190px;">
+                                                       name="HSupName" id="HSupName" style="width:190px;">
                                             </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="HBillno2" id="HBillno2" style="width:190px;">
+                                                       name="HBillno2" id="HBillno2" style="width:190px;">
                                             </div>
                                         </div>
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
-                                            lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>
+                                                lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">
+                                            閲嶆柊鍚屾
+                                        </button>
 
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
-                                            lay-filter="btnResCnzManual" id="btnResCnzManual"
-                                            style="padding:0 5px">鎵嬪伐鍚屾</button>
+                                                lay-filter="btnResCnzManual" id="btnResCnzManual"
+                                                style="padding:0 5px">
+                                            鎵嬪伐鍚屾
+                                        </button>
                                     </div>
                                     <div class="layui-inline">
                                         <div class="layui-row" style="margin-top:5px">
@@ -119,13 +132,13 @@
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
                                                     <select name="ColName" id="ColName" class="ForFilteringSchemes"
-                                                        lay-filter="ColName" style="width:190px;">
+                                                            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;">
+                                                        lay-filter="Comparator" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
@@ -145,7 +158,7 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                    name="ColContent" id="ColContent">
+                                                       name="ColContent" id="ColContent">
                                             </div>
                                         </div>
 
@@ -154,13 +167,13 @@
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
                                                     <select name="ColName1" id="ColName1" class="ForFilteringSchemes"
-                                                        lay-filter="ColName1" style="width:190px;">
+                                                            lay-filter="ColName1" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
@@ -180,7 +193,7 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                    name="ColContent1" id="ColContent1">
+                                                       name="ColContent1" id="ColContent1">
                                             </div>
                                         </div>
 
@@ -189,13 +202,13 @@
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
                                                     <select name="ColName2" id="ColName2" class="ForFilteringSchemes"
-                                                        lay-filter="ColName2" style="width:190px;">
+                                                            lay-filter="ColName2" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
                                                 <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                        class="ForFilteringSchemes" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
@@ -215,7 +228,7 @@
                                             </div>
                                             <div class="layui-inline">
                                                 <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                    name="ColContent2" id="ColContent2">
+                                                       name="ColContent2" id="ColContent2">
                                             </div>
                                         </div>
                                     </div>
@@ -507,6 +520,8 @@
                 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
+
+                Organ();
             }
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
@@ -622,7 +637,28 @@
                     }
                 });
             }
-
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.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].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
             //鏌ヨ瀛愯〃鏁版嵁
             function get_DisplaySub(obj) {
                 var datas = obj; //鑾峰緱褰撳墠琛屾暟鎹�
@@ -1121,6 +1157,7 @@
                 var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
                 var HEmpName = $("#HEmpName").val();
                 var HSupName = $("#HSupName").val();//渚涘簲鍟�
+                var HUSEORGID = $("#HUSEORGID").val();//zuzhi
                 //浠绘剰瀛楁杩囨护
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
@@ -1217,7 +1254,9 @@
                     sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
 
                 }
-
+                if (HUSEORGID) {
+                    sWhere += " and 缁勭粐 like '%" + HUSEORGID + "%'";
+                }
 
                 sWhere += addSWhereByOpenType();
                 //娣诲姞鏌ヨ鏉′欢锛屾牴鎹綋鍓嶇櫥褰曠敤鎴峰叧鑱旇亴鍛樿繑鍥炴暟鎹�
@@ -1329,7 +1368,9 @@
                             dataCol = data1.data[0].HGridString.split(',');
 
                             for (var i = 0; i < option.cols[0].length - 1; i++) {
-                                var dataCols = dataCol[i].split('|');
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
                                 //闅愯棌鍒�
                                 if (dataCols[1] == 1) {
                                     option.cols[0][i + 1]["hide"] = true;
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
index 22611bb..3dcb17d 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\205\266\344\273\226\345\207\272\345\272\223/Add_Edit_Kf_OtherOutBill.html"
@@ -79,55 +79,17 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
-                                            </div>
-                                        </div>
-
-
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
-                                            <label class="layui-form-label">璋冨嚭浠撳簱ID</label>
-                                            <div class="layui-input-inline">
-                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </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="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </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="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">涓荤</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
-
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">浠撳簱</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
+                                    </div>
+                                    <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">閮ㄩ棬</label>
                                             <div class="layui-input-inline">
@@ -138,8 +100,83 @@
                                                 </button>
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
+                                                    <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
+                                                </select>
+
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閫夊崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+
+                                                <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-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </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="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">楠屾敹鍛�</label>
                                             <div class="layui-input-inline">
@@ -160,51 +197,9 @@
                                                 </button>
                                             </div>
                                         </div>
-                                      
-                                    </div>
-
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
-                                            <div class="layui-input-inline">
-                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
-                                                    <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
-                                                </select>
-                                               
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">閫夊崟鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
-                                                
-                                                <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-row">
-
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">鎽樿</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                            </div>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
-
-
                             <!--鍒跺崟淇℃伅-->
                             <div class="layui-tab-item">
                                 <div class="layui-form-item">
@@ -286,6 +281,10 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>鎵归噺鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
@@ -323,14 +322,28 @@
             var year = date.getFullYear();
             var shijian = year + "-" + month + "-" + day;
 
+            var option = {};
+
             var allVal;
+            var HModName = "Add_Edit_Kf_OtherOutBill";
+            //闇�瑕佹壒閲忓垹闄ょ殑鍒楄〃
+            var btnBatchDeleteList = [];
             //#endregion
 
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //#region 椤甸潰鍒濆鍖�
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+            //#endregion
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1206";
@@ -343,6 +356,8 @@
             //鑾峰彇婧愬崟绫诲瀷
             //HSourceBillType();
             //鑾峰彇椤甸潰璺宠浆鍙傛暟
+
+            //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -352,28 +367,69 @@
                 OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 linterid = params[params[1]];//婧愬崟id
             }
+            //#endregion
 
- 
-            //鍒ゆ柇鎿嶄綔绫诲瀷
+            //#region 閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠″垵濮嬪寲
+            getCzyglByUser();
+
+            //#region 鏍规嵁璐﹀彿鑾峰彇閮ㄩ棬銆佽亴鍛樸�佷富绠�
+            function getCzyglByUser() {
+                $.ajax({
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "CurUserName": sessionStorage["HUserName"]
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+
+                            $("#HEmpID").val(data.HEmpID);
+                            $("#HEmpName").val(data.HEmpName);
+                            $("#HDeptID").val(data.HDeptID);
+                            $("#HDeptName").val(data.HDeptName);
+                            $("#HManagerID").val(data.HManagerID);
+                            $("#HManagerName").val(data.HManagerName);
+
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏄庣粏琛屽垵濮嬪寲
+            var rowdata = [{
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "0", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                "HQtyMust": "0", "HQty": "0","HPieceQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+            }];
+            // 鍒濆鍖栫晫
+            set_InitGrid();
+            //鍒锋柊琛ㄦ牸鏁版嵁
+            DisPlay_HideColumn();
+            //#endregion
+
+            //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
-             
             }
             else if (OperationType == 3) {//缂栬緫
-               
                 $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
             }
-            
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-
-            //#endregion
-
-
-
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
@@ -386,476 +442,22 @@
                     type: "GET",
                     data: { "HBillType": '1206' },
                     success: function (d) {
-                      
+
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                         $("#HInterID").val(d.data[0].HInterID);
                     }
                 });
-            } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 $("#HInterID").val(linterid);
                 RoadBillMain(linterid);
             }
             //#endregion
             //#endregion
 
-            var rowdata = [{
-                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "","HSecUnitRate":"0",   "HUnitID": 0, "璁¢噺鍗曚綅": "",   "HRemark": "",
-                "HQtyMust": "0","HQty": "0","HPrice": "0", "HMoney": "0",   "HWHID": 0, "鏀舵枡浠撳簱": "",
-                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0, 
-            }];
-            // 鍒濆鍖栫晫
-            set_InitGrid();
-
-            //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                //鏂板琛岃〃鏍兼暟鎹�
-                var NewRow = {
-                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "",  "HSecUnitRate": "0",  "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                    "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
-                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
-                };
-                switch (obj.event) {
-                    //搴撳瓨鏌ヨ
-                    case 'get_Inventory': get_Inventory();
-                        break;
-                    //鍑哄叆搴撹褰曟煡璇�
-                    case 'get_InOutSum': get_InOutSum();
-                        break;
-
-                    case 'btn-AddLine':
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-
-                        table.render(option);
-                        //鍒锋柊澶嶉�夋
-                        //checkRefresh();
-                        break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
-                        }
-                        break;
-                  
-                }
-            });
-
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
-
-           
-
-            //閫夋嫨涓荤鎸夐挳
-            form.on('submit(HManagerList)', function () {
-                get_checkManager();
-            });
-            //閫夋嫨浠撳簱鎸夐挳
-            form.on('submit(HWHList)', function () {
-                get_checkWH();
-            });
-            //閫夋嫨楠屾敹鍛樻寜閽�
-            form.on('submit(HSecManagerList)', function () {
-                get_checkSecManager();
-            });
-            //閫夋嫨淇濈鍛樻寜閽�
-            form.on('submit(HKeeperList)', function () {
-                get_checkKeeper();
-            });
-            //閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(HDeptList)', function () {
-                get_checkDept();
-            });
-
-            
-
-
-            //淇濆瓨鎸夐挳
-            form.on('submit(set_SaveBill)', function (data) {
-                set_SaveBill(data);
-            });
-            //#region 瀹℃牳鎸夐挳
-            form.on('submit(set_CheckBill)', function (data) {
-                set_CheckBill(1);
-            });
-            //#endregion
-
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
-                var data = obj.data;
-                if (obj.event == 'HDate') {
-                    var field = $(this).data('field');
-                    laydate.render({
-                        elem: this.firstChild
-                        , show: true //鐩存帴鏄剧ず
-                        , closeStop: this
-                        , done: function (nowDate) {
-                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
-                            data[field] = nowDate;
-                            obj.update(data);
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
-                        }
-                    });
-                }
-            });
-
-
-            //#endregion
-
-
-            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
-            table.on('edit(mainTable)', function (obj) {
-                //鏁板�兼牸寮忔牎楠屽伐鍏�
-                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
-                var temp = "";
-
-                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
-                var oldText = $(this).prev().text();
-                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
-                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
-                    , field = obj.field; //寰楀埌瀛楁
-
-                switch (field) {
-                    case "HQty":                                         //鏁伴噺
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HQty: oldText
-                            });
-                            table.render(option);
-
-                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = value * 1;                           //鏁伴噺
-                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
-                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        /* table.render(option);*/
-                        break;
-                    case "HPrice":                                         //鍗曚环
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HPrice: oldText
-                            });
-                            /* table.render(option);*/
-
-                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
-                        var HPrice = value * 1;
-                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        break;
-                    case "HMoney":                                         //閲戦
-                        //鏁版嵁鏍煎紡鏍¢獙
-                        temp = value + "";
-                        if (!ref.test(temp) || temp == 0) {
-                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
-                            obj.update({
-                                HMoney: oldText
-                            });
-                            /* table.render(option);*/
-
-                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
-                            return;
-                        }
-
-                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
-                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
-                        var HMoney = value * 1;
-                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
-
-
-                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                        obj.update({
-                            HQty: HQty
-                            , HPrice: HPrice
-                            , HMoney: HMoney
-                        });
-                        break;
-                        table.render(option);
-                    default:
-                }
-            });
-            //#endregion
-            //#endregion
-            //#endregion
-
-
-            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-            //#region 搴撳瓨鏌ヨ
-            function get_Inventory() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
-                    var HMaterID = data[0].HMaterID.toString();
-                    //寮圭獥鏂规硶
-                    layer.open({
-                        type: 2//寮圭獥绫诲瀷
-                        , skin: 'layui-layer-rim' //鍔犱笂杈规
-                        , area: ['90%', '90%']//澶у皬
-                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
-                        , shift: 2//寮瑰嚭鍔ㄧ敾
-                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
-                        , btn: ['鍙栨秷']
-                        , btn1: function (index, layero) {
-                            layer.close(index);
-                        }
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
-                }
-            }
-            //#endregion
-            //#region 鍑哄叆搴撹褰曟煡璇�
-            function get_InOutSum() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
-                    var HMaterID = data[0].HMaterID.toString();
-                    layer.open({
-                        type: 2//寮圭獥绫诲瀷
-                        , skin: 'layui-layer-rim' //鍔犱笂杈规
-                        , area: ['90%', '90%']//澶у皬
-                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
-                        , shift: 2//寮瑰嚭鍔ㄧ敾
-                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
-                        , btn: ['鍙栨秷']
-                        , btn1: function (index, layero) {
-                            layer.close(index);
-                        }
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
-                }
-            }
-            //#endregion
-            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            function get_LoginIs() {
-                if (sessionStorage.login != "login") {
-                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                    }, function () { window.location.href = "../../user/login.html"; });
-                }
-            }
-            //#endregion
-
-
-            //鑾峰彇缁勭粐
-            function Organ() {
-                //鑾峰彇鐧诲綍椤电粍缁囧垪
-                var Organization = '';
-                $.ajax({
-                    type: "get",
-                    url: GetWEBURL() + "/Web/GetOrganizations",
-                    success: function (result) {
-                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data;
-                            for (var i = 0; i < data.length; i++) {
-                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
-                            }
-                            $("#HUSEORGID").append(Organization);
-                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
-                    }
-                })
-            }
-
-            //鏃ユ湡鏍煎紡鍖�
-            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 set_InitGrid() {
-                option = {
-                    elem: '#mainTable'
-                    , toolbar: '#toolbarDemo'
-                    , limit: 500
-                    , height: 500
-                    , loading: false
-                    , totalRow: true
-                    , cols: [[ //瀛愯〃
-                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
-                        , { type: 'numbers', title: '搴忓彿', width: 100 }
-                        , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
-                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
-                        , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
-                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
-                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
-                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
-                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
-                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true }
-                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150, edit: 'text', event: "HPropertyID" }//f7
-                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text' }
-                 
-                        //, { field: 'HAuxPropID', title: 'HAuxPropID', width: 100, hide: true }
-                        //, { field: '鐗╂枡杈呭姪灞炴��', title: '鐗╂枡杈呭姪灞炴��', width: 150, edit: 'text'}//f7
-                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
-                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
-                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, edit: 'text', totalRow: true}
-                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true}
-                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
-                        , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
-                     
-                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
-                        , { field: '鏀舵枡浠撳簱', title: '鍙戞枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
-                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
-                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true }
-                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
-                        , { field: 'HBatchNo', title: '鎵规', width: 150, edit: 'text', hide: true }
-                        , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟涓诲唴鐮�
-                        , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟瀛愬唴鐮�
-                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 150, edit: 'text', event: "HPOOrderBillNo" }//閲囪喘璁㈠崟鍙�
-                        , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 100, hide: true }//閿�鍞鍗曚富鍐呯爜
-                        , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true }//閿�鍞鍗曞瓙鍐呯爜
-                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 150, edit: 'text', event: "HSeOrderBillNo" }//閿�鍞鍗曞彿
-                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
-                      
-                    ]]
-                }
-             
-                option.data = [];
-                table.render(option);
-            }
-
-            //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid) {
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + "Kf_OtherOutBill/Kf_OtherOutBillEdit",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data[0];
-                            data1 = result.data[1];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-
-                                "HInterID": data[0]["hmainid"]
-                                , "HBillNo": data[0]["鍗曟嵁鍙�"]
-                                , "HDate": formatDate(data[0]["鏃ユ湡"])
-                                , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
-                               
-                                
-                                , "HWHID": data[0]["HWHID"]
-                                , "HWHName": data[0]["浠撳簱"]
-                                , "HSecManagerID": data[0]["HSecManagerID"]
-                                , "HSecManagerName": data[0]["楠屾敹鍛�"]
-                                , "HKeeperID": data[0]["HKeeperID"]
-                                , "HKeeperName": data[0]["淇濈鍛�"]
-                                , "HDeptName": data[0]["閮ㄩ棬"]
-                                , "HDeptID": data[0]["HDeptID"]
-                                , "HManagerID": data[0]["HManagerID"]
-                                , "HMangerName": data[0]["涓荤"]
-                                , "HExplanation": data[0]["HExplanation"]
-
-                                , "HRemark": data[0]["琛ㄥご澶囨敞"]
-                                , "HMaker": data[0]["鍒跺崟浜�"]
-                                , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HUpDater": data[0]["淇敼浜�"]
-                                , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HChecker": data[0]["瀹℃牳浜�"]
-                                , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HCloseMan": data[0]["鍏抽棴浜�"]
-                                , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
-                                , "HDeleteMan": data[0]["浣滃簾浜�"]
-                                , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
-                   
-                            });
-                          
-                          
-                            option.data = data1;
-                            table.render(option);
-                            form.render('select');
-
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-            //#endregion
-       
-            //閫�鍑�
+            //#region 鑿滃崟鏍忔搷浣滄寜閽�
+            //#region 閫�鍑烘寜閽�
             form.on('submit(Exit)', function (data) {
                 if (linterid == undefined) {
                     //鍏抽棴椤电
@@ -866,52 +468,73 @@
                     Pub_Close(1);
                 }
             });
+            //#endregion
 
-            //瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
-            function set_CheckBill(num) {
-                var HInterID = $("#HInterID").val();
-                $.ajax({
-                    url: GetWEBURL() + '/Kf_OtherOutBill/CheckKf_OtherOutBill',
-                    type: "GET",
-                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                // 寰楀埌frame绱㈠紩
-                                var index = layer.getFrameIndex(window.name);
-                                //鍏抽棴褰撳墠frame
-                                layer.close(index);
-                            });
-                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-           
-           
+            //#region 淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
-               
-                if ($("#HDeptName").val() == 0) {
-                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^\d+$/;                 //姝f暣鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                //if ($("#HDeptName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+
+                //if ($("#HWHName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HKeeperID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HSecManagerID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨寰�鏉ュ崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-               
-                if ($("#HWHName").val() == 0) {
-                    layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HKeeperID").val() == 0) {
-                    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSecManagerID").val() == 0) {
-                    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
+
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i+1) + "琛岋細璇烽�夋嫨鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+
+                    //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炲彂鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+
+                    //浠舵暟鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPieceQty"] + "";
+                    if (!ref1.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    //else if (temp * 1 == 0) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return false;
+                    //}
                 }
 
 
@@ -989,20 +612,56 @@
                 });
             }
             //#endregion
-          
-            ////#endregion
+            //#endregion
 
-              //#region  浠撳簱 閮ㄩ棬 淇濈鍛� 涓荤 楠屾敹鍛�
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(1);
+            });
 
-            //浠撳簱
-            function get_checkWH() {
+            //#region 瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
+            function set_CheckBill(num) {
+                var HInterID = $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + '/Kf_OtherOutBill/CheckKf_OtherOutBill',
+                    type: "GET",
+                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                            });
+                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄥご鍩虹璧勬枡閫夋嫨
+            //#region 閫夋嫨閿�鍞憳鎸夐挳
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            //#region 閿�鍞憳閫夋嫨椤甸潰
+            function get_checkEmp() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , title: '閿�鍞憳鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1010,60 +669,30 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
-                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+
+                        getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //楠屾敹鍛�
-            function get_checkSecManager() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '楠屾敹鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    , btn2: function (index, layero) {
+                        $("#HEmpName").val("");
+                        $("#HEmpID").val("0");
+
+                        $("#HDeptID").val("0");
+                        $("#HDeptName").val("");
                     }
-                    , btn2: function (index, layero) { }
                 })
             }
-            //淇濈鍛�
-            function get_checkKeeper() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '淇濈鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //閮ㄩ棬
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //#region 閮ㄩ棬
             function get_checkDept() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1086,7 +715,15 @@
                     , btn2: function (index, layero) { }
                 })
             }
-            //涓荤
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+
+            //#region 涓荤
             function get_checkManager() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
@@ -1102,7 +739,7 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                      
+
                         $("#HManagerID").val(checkStatus.data[0].HItemID);
                         $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
 
@@ -1111,10 +748,621 @@
                     , btn2: function (index, layero) { }
                 })
             }
+            //#endregion
+            //#endregion
 
-             //#endregion
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
 
-            //琛屽唴蹇嵎閿瓫閫�
+            //#region 浠撳簱
+            function get_checkWH() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+
+                        if (option.data.length > 0) {
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (option.data[i]["HWHID"] == 0) {
+                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+                                    option.data[i]["鏀舵枡浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+                                }
+                            }
+                        }
+                        table.render(option);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+
+            //#region 楠屾敹鍛�
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '楠屾敹鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+
+            //#region 淇濈鍛�
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '淇濈鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(HSupList)', function () {
+                get_checkCus();
+            });
+
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkCus() {
+                var HEmpID = $("#HEmpID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟瀹㈡埛鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp=' + HEmpID, '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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        $("#HSupName").val(checkStatus.data[0].HName);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+
+                if ($("#HSourceBillType").val() != 0 && $("#HSourceBillType").val() !== null) {
+                    return layer.msg('浣犻�夋嫨鐨勬簮鍗曚笉瀛樺湪');
+                }
+                var url = getSupType().url;
+                url = encodeURI(url);
+
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: '' + getSupType().name + '鍒楄〃'  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [url, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length == 0) {
+                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+                        }
+                        layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+                        //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
+                        var ProcessNumber = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            ProcessNumber.push(checkStatus.data[i]);
+                        }
+
+                        //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                        var NowNum = 0;
+                        NowNum = option.data.length;
+
+                        if (getSupType().name == "閲囪喘璁㈠崟") {
+                            var j = 0;
+                            for (var i = 0; i < checkStatus.data.length; i++) {
+                                option.data.push({
+                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
+                                    "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
+                                    "HMoney": checkStatus.data[j].閲戦,
+                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                })
+                                j++;
+                            }
+                            table.render(option);
+                            layer.close(index);
+                        } else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
+                            var j = 0;
+                            for (var i = 0; i < ProcessNumber.length; i++) {
+                                option.data.push({
+                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                    "   ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": "0", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
+                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                })
+                                j++;
+                            }
+                            table.render(option);
+                            layer.close(index);//鍏抽棴寮圭獥
+                        }
+
+                    }
+
+                });
+            });
+
+            //#region 鍔ㄦ�佸脊鍑洪〉闈�
+            function getSupType() {
+                var type = $("#HSourceBillType").val();
+                switch (type) {
+                    case '1102':
+                        return { url: "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html", name: "閲囪喘璁㈠崟" };
+                        break;
+                    case '1103':
+                        return { url: "../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html", name: "鏀舵枡閫氱煡鍗�" };
+                        break;
+                }
+            }
+           //#endregion
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄦ牸鐩戝惉浜嬩欢
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HPropertyID": "0", "杈呭姪灞炴��": "", "HSecUnitRate": "0", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                    "HQtyMust": "0", "HQty": "0","HPieceQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                    "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+                };
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        //鍒锋柊澶嶉�夋
+                        //checkRefresh();
+                        break;
+                    //澶嶅埗
+                    case 'btn-CopyLine':
+                        var copydata = JSON.stringify(data);
+                        if (data.length <= 0) {
+                            layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                        }
+                        else if (data.length > 1) {
+                            layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                        }
+                        else {
+                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            //鍒锋柊澶嶉�夋
+                            //checkRefresh();
+                        }
+                        break;
+                    //涓婄Щ
+                    case 'btn-Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn-Under': btn_under();
+                        break;
+                    //鎵归噺鍒犻櫎
+                    case 'btn-batchDelete': btn_batchDelete();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
+                }
+            });
+
+            //#region 涓婄Щ
+            function btn_up() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == 0) {
+                                layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+                                return;
+                            }
+                            tables.push(option.data[i - 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i - 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 涓嬬Щ
+            function btn_under() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == option.data.length - 1) {
+                                layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+                                return;
+                            }
+
+
+                            tables.push(option.data[i + 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i + 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 鎵归噺鍒犻櫎
+            function btn_batchDelete() {
+                var data = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    if ($.inArray(i + "", btnBatchDeleteList) == -1) {
+                        data.push(option.data[i]);
+                    }
+                }
+                option.data = data;
+                table.render(option);
+
+                btnBatchDeleteList = [];
+            }
+
+            //#region 鐩戝惉澶嶉�夋閫変腑浜嬩欢
+            table.on('checkbox(mainTable)', function (obj) {
+                //鑾峰彇閫変腑琛岀殑绱㈠紩鍒楄〃
+                var rowIndex = $(obj.tr).attr("data-index");
+
+                if (typeof (rowIndex) == "undefined") {
+                    if (btnBatchDeleteList.length == option.data.length) {
+                        btnBatchDeleteList = [];
+                    } else {
+                        btnBatchDeleteList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            btnBatchDeleteList.push(i + "");
+                        }
+                    }
+                } else {
+                    if ($.inArray(rowIndex, btnBatchDeleteList) > -1) {
+                        var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                        btnBatchDeleteList = btnBatchDeleteList_New;
+                    } else {
+                        btnBatchDeleteList.push(rowIndex);
+                    }
+                }
+                console.log(btnBatchDeleteList);
+            });
+            //#endregion
+            //#endregion
+
+            //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID", "璁㈠崟绛夌骇浠g爜", "閿�鍞嚭搴撴暟閲�", "閿�鍞嚭搴撳鏍告暟閲�", "閿�鍞嚭搴撳鏍搁噾棰�", "鐢熶骇鏁伴噺", "閿�鍞��搴撴暟閲�", "閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            titleData = [];
+
+                            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;
+                                }
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) > -1) {
+                                    option.cols[0][i + 1]["hide"] = 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];
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 搴撳瓨鏌ヨ
+            function get_Inventory() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    //寮圭獥鏂规硶
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '搴撳瓨鏌ヨ鍒楄〃'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+
+            //#region 鍑哄叆搴撹褰曟煡璇�
+            function get_InOutSum() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
+                    var HMaterID = data[0].HMaterID.toString();
+                    layer.open({
+                        type: 2//寮圭獥绫诲瀷
+                        , skin: 'layui-layer-rim' //鍔犱笂杈规
+                        , area: ['90%', '90%']//澶у皬
+                        , title: '鍑哄叆搴撹褰曞垪琛�'//鏍囬
+                        , shift: 2//寮瑰嚭鍔ㄧ敾
+                        , content: ['../../浠撳瓨绠$悊/鏉$爜鎶ヨ〃/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
+                        , btn: ['鍙栨秷']
+                        , btn1: function (index, layero) {
+                            layer.close(index);
+                        }
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
+                }
+            }
+            //#endregion
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+            //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            option.data = oldData;
+                            table.render(option);
+
+                            //鏇存柊鎵归噺鍒犻櫎绱㈠紩鍒楄〃
+                            var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                            btnBatchDeleteList = btnBatchDeleteList_New;
+                            for (var i = 0; i < btnBatchDeleteList.length; i++) {
+                                if (btnBatchDeleteList[i] * 1 > rowIndex * 1) {
+                                    btnBatchDeleteList[i] = (btnBatchDeleteList[i] * 1 - 1) + "";
+                                }
+                            }
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 琛屽唴蹇嵎閿瓫閫�
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
@@ -1139,7 +1387,7 @@
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
 
-                                  
+
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
                                         "HMaterID": checkStatus.data[0].HItemID,
@@ -1151,15 +1399,15 @@
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
-                             , end: function () {
-                                    obj.update({
-                                     "HMaterID" :OptionData.HMaterID
-                                        ,"鐗╂枡浠g爜" : OptionData.鐗╂枡浠g爜
-                                       , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
-                                        ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
-                                        ,"HUnitID" :OptionData.HUnitID
-                                        ,"璁¢噺鍗曚綅" : OptionData.璁¢噺鍗曚綅鍚嶇О
-                                })
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HMaterID": OptionData.HMaterID
+                                    //    , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                    //    , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                    //    , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                    //    , "HUnitID": OptionData.HUnitID
+                                    //    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    //})
                                 }
                             });
                         }
@@ -1183,7 +1431,7 @@
                                     if (checkStatus.data.length != 1) {
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
-                                     OptionData = checkStatus.data[0];
+                                    OptionData = checkStatus.data[0];
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
 
@@ -1193,11 +1441,11 @@
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
                                 , end: function () {
-                                obj.update({
-                                    "HPropertyID": OptionData.HItemID
-                                    , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
-                                })
-                            }
+                                    //obj.update({
+                                    //    "HPropertyID": OptionData.HItemID
+                                    //    , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
+                                    //})
+                                }
                             })
                         }
                         //璁¢噺鍗曚綅
@@ -1221,21 +1469,21 @@
                                         return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
                                     }
 
-                                    
+
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        
+
                                         "HUnitID": checkStatus.data[0].HItemID,
                                         "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
-                              , end: function () {
-                                obj.update({
-                                    "HUnitID": OptionData.HItemID
-                                    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                })
-                            }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HUnitID": OptionData.HItemID
+                                    //    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    //})
+                                }
                             })
                         }
                         //鏀舵枡浠撳簱
@@ -1260,18 +1508,18 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                        
+
                                         "HWHID": checkStatus.data[0].HItemID,
                                         "鏀舵枡浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
-                                 , end: function () {
-                                obj.update({
-                                    "HWHID": OptionData.HItemID
-                                    , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
-                                })
-                            }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HWHID": OptionData.HMainID
+                                    //    , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+                                    //})
+                                }
                             })
                         }
                         //浠撲綅
@@ -1296,21 +1544,20 @@
                                     }
                                     //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
                                     obj.update({
-                                       
-                                        "HSPID": checkStatus.data[0].HItemID,
-                                         "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
+                                        "HSPID": checkStatus.data[0].HMainID,
+                                        "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
                                     })
                                     layer.close(index);//鍏抽棴寮圭獥
                                 }
-                            , end: function () {
-                                obj.update({
-                                    "HSPID": OptionData.HMainID
-                                    , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
-                                })
-                            }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HSPID": OptionData.HMainID
+                                    //    , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                    //})
+                                }
                             })
                         }
-                       
+
                         //閲囪喘璁㈠崟鍙�
                         if (obj.event == "HPOOrderBillNo") {
                             layer.open({
@@ -1377,103 +1624,278 @@
                     }
                 })
             }
+            //#endregion
+            //#endregion
 
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
 
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+                switch (field) {
+                    case "HQty":                                         //鏁伴噺
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HQty: oldText
+                            });
+                            //table.render(option);
+
+                            layer.msg("鏁伴噺璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = value * 1;                           //鏁伴噺
+                        var HPrice = obj.data.HPrice * 1;               //鍗曚环
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        /* table.render(option);*/
+                        break;
+                    case "HPrice":                                         //鍗曚环
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HPrice: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("鍗曚环璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HPrice = value * 1;
+                        var HMoney = HQty * HPrice;                     //閲戦=鏁伴噺*鍗曚环
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                    case "HMoney":                                         //閲戦
+                        //鏁版嵁鏍煎紡鏍¢獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            /* table.render(option);*/
+
+                            layer.msg("閲戦璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+
+                        //鏁版嵁鏍¢獙鍚堟牸锛岄噸绠楄褰�
+                        var HQty = obj.data.HQty * 1;                   //鏁伴噺
+                        var HMoney = value * 1;
+                        var HPrice = (HMoney / HQty).toFixed(2);       //鍗曚环=閲戦/鏁伴噺
+
+
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: HQty
+                            , HPrice: HPrice
+                            , HMoney: HMoney
+                        });
+                        break;
+                        //table.render(option);
+                    default:
+                }
             });
+            //#endregion
+            //#endregion
 
-            //#region 鍔ㄦ�佸脊鍑洪〉闈�
-            function getSupType() {
-                var type = $("#HSourceBillType").val();
-                switch (type) {
-                    case '1102':
-                        return { url: "../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html", name: "閲囪喘璁㈠崟" };
-                        break;
-                    case '1103':
-                        return { url: "../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html", name: "鏀舵枡閫氱煡鍗�" };
-                        break;
-                }
-            }
-           //#endregion
-
-            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
-            form.on('submit(XDHList)', function () {
-
-                if ($("#HSourceBillType").val() != 0 && $("#HSourceBillType").val()!== null) {
-                    return layer.msg('浣犻�夋嫨鐨勬簮鍗曚笉瀛樺湪');
-                }
-                var url = getSupType().url;
-                url = encodeURI(url);
-
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: '' + getSupType().name + '鍒楄〃'  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["90%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [url, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鎸夐挳涓�  鐨勫洖璋�
-                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                        if (checkStatus.data.length == 0) {
-                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
-                        }
-                        layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
-                        //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
-                        var ProcessNumber = [];
-                        for (var i = 0; i < checkStatus.data.length; i++) {
-                            ProcessNumber.push(checkStatus.data[i]);
-                        }
-
-                        //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
-                        var NowNum = 0;
-                        NowNum = option.data.length;
-
-                        if (getSupType().name == "閲囪喘璁㈠崟") {
-                            var j = 0;
-                            for (var i = 0; i < checkStatus.data.length; i++) {
-                                option.data.push({
-                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
-                                    "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦,
-                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                })
-                                j++;
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                             }
-                            table.render(option);
-                            layer.close(index);
-                        } else if (getSupType().name =="鏀舵枡閫氱煡鍗�") {
-                            var j = 0;
-                            for (var i = 0; i < ProcessNumber.length; i++) {
-                                option.data.push({
-                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "   ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": "0", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
-                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦,   "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
-                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                })
-                                j++;
-                            }
-                            table.render(option);
-                            layer.close(index);//鍏抽棴寮圭獥
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
                         }
-                        
+                        layer.closeAll("loading");
                     }
-                       
+                })
+            }
+            //#endregion
+
+            //#region 鏃ユ湡鏍煎紡鍖�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+            //#endregion
+
+            //#region 瀛愯〃鍒濆鍖�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , totalRow: true
+                    , cols: [[ //瀛愯〃
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { type: 'HSourceBillNo', title: '婧愬崟鍙�', width: 100, hide: true }//婧愬崟鍙�
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }//婧愬崟绫诲瀷
+                        , { type: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }//婧愬崟涓诲唴鐮�
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }//婧愬崟瀛愬唴鐮�
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150, edit: 'text', event: "HMaterID" }//f7
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100, }
+                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true }
+                        , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 150, edit: 'text', event: "HPropertyID" }//f7
+                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, edit: 'text' }
+                 
+                        //, { field: 'HAuxPropID', title: 'HAuxPropID', width: 100, hide: true }
+                        //, { field: '鐗╂枡杈呭姪灞炴��', title: '鐗╂枡杈呭姪灞炴��', width: 150, edit: 'text'}//f7
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
+                        , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, totalRow: true}
+                        , { field: 'HQty', title: '瀹炲彂鏁伴噺', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HPieceQty', title: '浠舵暟', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
+                        , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
+                     
+                        , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+                        , { field: '鏀舵枡浠撳簱', title: '鍙戞枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
+                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
+                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true }
+                        , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
+                        , { field: 'HBatchNo', title: '鎵规', width: 150, edit: 'text', hide: true }
+                        , { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟涓诲唴鐮�
+                        , { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 100, hide: true }//閲囪喘璁㈠崟瀛愬唴鐮�
+                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 150, edit: 'text', event: "HPOOrderBillNo" }//閲囪喘璁㈠崟鍙�
+                        , { field: 'HSeOrderInterID', title: '閿�鍞鍗曚富鍐呯爜', width: 100, hide: true }//閿�鍞鍗曚富鍐呯爜
+                        , { field: 'HSeOrderEntryID', title: '閿�鍞鍗曞瓙鍐呯爜', width: 100, hide: true }//閿�鍞鍗曞瓙鍐呯爜
+                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 150, edit: 'text', event: "HSeOrderBillNo" }//閿�鍞鍗曞彿
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                      
+                    ]]
+                }
+             
+                option.data = [];
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Kf_OtherOutBill/Kf_OtherOutBillEdit",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            data1 = result.data[1];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+
+                                "HInterID": data[0]["hmainid"]
+                                , "HBillNo": data[0]["鍗曟嵁鍙�"]
+                                , "HDate": formatDate(data[0]["鏃ユ湡"])
+                                , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
+                               
+                                , "HSupID": data[0]["HSupID"]
+                                , "HSupName": data[0]["寰�鏉ュ崟浣�"]
+                                , "HWHID": data[0]["HWHID"]
+                                , "HWHName": data[0]["浠撳簱"]
+                                , "HSecManagerID": data[0]["HSecManagerID"]
+                                , "HSecManagerName": data[0]["楠屾敹鍛�"]
+                                , "HKeeperID": data[0]["HKeeperID"]
+                                , "HKeeperName": data[0]["淇濈鍛�"]
+                                , "HDeptName": data[0]["閮ㄩ棬"]
+                                , "HDeptID": data[0]["HDeptID"]
+                                , "HManagerID": data[0]["HManagerID"]
+                                , "HMangerName": data[0]["涓荤"]
+                                , "HEmpID": data[0]["HEmpID"]
+                                , "HEmpName": data[0]["涓氬姟鍛�"]
+                                , "HExplanation": data[0]["HExplanation"]
+
+                                , "HRemark": data[0]["琛ㄥご澶囨敞"]
+                                , "HMaker": data[0]["鍒跺崟浜�"]
+                                , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HUpDater": data[0]["淇敼浜�"]
+                                , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HChecker": data[0]["瀹℃牳浜�"]
+                                , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HCloseMan": data[0]["鍏抽棴浜�"]
+                                , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HDeleteMan": data[0]["浣滃簾浜�"]
+                                , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+                   
+                            });
+                          
+                          
+                            option.data = data1;
+                            table.render(option);
+                            form.render('select');
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
                 });
-            });
-            //鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
+            }
+            //#endregion
+       
+            //#region 鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
             function checkDuplicateData(data) {
                 const duplicates = [];
 
@@ -1495,34 +1917,8 @@
                 }
                 return duplicates;
             }
-            //琛屽唴鍒犻櫎
-            function set_GridDelete(obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            obj.del();
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
-                            layer.close(index);
-                        }
-                    });
-                }
-            }
-            
-
-            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-            function ReRoadBillMain() {
-                location.replace('Add_Edit_Kf_POStockInBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
-                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
-            }
             //#endregion
-
+            
             //#region 鑾峰彇婧愬崟绫诲瀷
             function HSourceBillType() {
                 var HName = '鍏朵粬鍏ュ簱鍗�';
@@ -1546,20 +1942,24 @@
                 })
             }
             //#endregion
-
             //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
         });
-         function GetHSecManagerValue(obj)  //杩斿洖楠屾敹鍛�
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+
+            getEmpInfoByHEmpID(obj[0].HItemID)
+        }
+
+        function GetHSecManagerValue(obj)  //杩斿洖楠屾敹鍛�
         {
             $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HSecManagerID").val(obj[0].HItemID);
         }
 
-       function GetHKeeperValue(obj)  //杩斿洖淇濈鍛�
-       {
+        function GetHKeeperValue(obj)  //杩斿洖淇濈鍛�
+        {
             $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HKeeperID").val(obj[0].HItemID);
         }
@@ -1580,32 +1980,62 @@
         {
             $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
-        } 
+        }
 
-         //鍙屽嚮杩斿洖鐗╂枡
-         function GetGyMaterial(data) {
-             OptionData = data
-         }
-           //鍙屽嚮杩斿洖璁¢噺鍗曚綅
-         function GetGyUnit(data) {
-             OptionData = data
-         }
+        //鍙屽嚮杩斿洖鐗╂枡
+        function GetGyMaterial(data) {
+            OptionData = data
+        }
+        //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+        function GetGyUnit(data) {
+            OptionData = data
+        }
 
-           //鍙屽嚮杩斿洖鏀舵枡浠撳簱
-         function GetGyWarehouse(data) {
-             OptionData = data
-         } 
-
+        //鍙屽嚮杩斿洖鏀舵枡浠撳簱
+        function GetGyWarehouse(data) {
+            OptionData = data
+        }
 
         //鍙屽嚮杩斿洖鏀舵枡浠撲綅
-         function GetGyStockPlace(data) {
-             OptionData = data
-         } 
+        function GetGyStockPlace(data) {
+            OptionData = data
+        }
 
         //鍙屽嚮杩斿洖杈呭姪灞炴��
-         function GetGyProperty(data) {
-             OptionData = data
-         } 
+        function GetGyProperty(data) {
+            OptionData = data
+        }
+
+        function GetHSupValue(obj)  //杩斿洖瀹㈡埛
+        {
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+        function getEmpInfoByHEmpID(HEmpID) {
+            $.ajax({
+                url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+                async: false,
+                type: "GET",
+                data: {
+                    "HEmpID": HEmpID
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        $("#HDeptID").val(data.HDeptID);
+                        $("#HDeptName").val(data.HDeptName);
+                    } else {
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
index 3c42abe..5585a7a 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBillList_YP.html"
@@ -2234,32 +2234,28 @@
             function get_BalanceQuery() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                var ajaxLoad = layer.load();
                 if (data.length != 1) {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    layer.close(ajaxLoad);
                     return
                 }
                 $.ajax({
                     url: GetWEBURL() + '/Kf_SellOutBill/GetKf_CheckSellOutBill_BalanceQuery',
                     type: "GET",
-                    data: { "user": sessionStorage["Czybm"], "HInterID": data[0]["hmainid"] },
+                    data: { "user": sessionStorage["HUserName"], "HInterID": data[0]["hmainid"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             
-                            if(data1.data.HBack == 0){
+                            if(data1.data[0].HBack == 0){
                                 // 浣欓鍏呰冻
                                 layer.alert("瀹㈡埛浣欓鍏呰冻!", { icon: 6 });
                             }else {
                                 // 浣欓涓嶅厖瓒�
-                                layer.alert(data1["HRemark"], { icon: 5 });
+                                layer.alert(data1.data[0]["HRemark"], { icon: 5 });
                             }
                         } else {
-                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
index c0018ea..82880a8 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_MaoJian.html"
@@ -144,11 +144,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鑺辨<label style="color:red"> *
+                                            <label class="layui-form-label">姘村啿<label style="color:red"> *
                                                 </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWaterRush" id="HWaterRush" class="layui-input"
-                                                    value="" style="float:left;">
+                                                    value="0" style="float:left;">
                                             </div>
                                         </div>
                                     </div>
@@ -181,7 +181,7 @@
                                                 </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HMachineSpeed" id="HMachineSpeed"
-                                                    class="layui-input" value="" style="float:left;">
+                                                    class="layui-input" value="0" style="float:left;">
                                             </div>
                                         </div>
                                     </div>
@@ -191,13 +191,13 @@
                                                 </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HMaterEmpName" id="HMaterEmpName" readonly
-                                                    class="layui-input" value="" style="float:left;width:150px;">
+                                                       class="layui-input" value="" style="float:left;width:150px;">
                                                 <input type="hidden" name="HMaterEmpID" id="HMaterEmpID"
-                                                    class="layui-input" value="0" style="float:left;width:150px;">
+                                                       class="layui-input" value="0" style="float:left;width:150px;">
                                                 <button type="button" lay-submit="" class="layui-btn"
-                                                    lay-filter="btnSearchHMaterEmp" style="width:40px;">
+                                                        lay-filter="btnSearchHMaterEmp" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"
-                                                        style="margin-left:-9px;"></i>
+                                                       style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
                                         </div>
@@ -206,7 +206,7 @@
                                                 </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWaterRate" id="HWaterRate" class="layui-input"
-                                                    value="" style="float:left;">
+                                                       value="" style="float:left;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -214,21 +214,27 @@
                                                 </label></label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWaterQty" id="HWaterQty" class="layui-input"
-                                                    value="" style="float:left;" readonly="readonly" autocomplete="off">
+                                                       value="" style="float:left;" readonly="readonly" autocomplete="off">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">鍙暟</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HPieceQty" id="HPieceQty" class="layui-input"
-                                                    value="" style="float:left;">
+                                                       value="" style="float:left;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">绫虫暟</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HLong" id="HLong" class="layui-input" value="0"
-                                                    style="float:left;">
+                                                       style="float:left;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鑺辨</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HHuaGun" id="HHuaGun" class="layui-input" value="" style="float:left;">
                                             </div>
                                         </div>
                                     </div>
@@ -1531,6 +1537,7 @@
                                 , "HMaterEmpName": data.鎵撴祮浜哄悕绉�
                                 , "HMachineSpeed": data.鏈洪��
                                 , "HWaterRush": data.姘村啿
+                                , "HHuaGun": data.鑺辨
                                 , "HWaterQty": data.姘撮噺
                                 , "HWaterRate": data.姘存瘮
                                 , "HRemark": data.琛ㄥご澶囨敞
@@ -2192,7 +2199,7 @@
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁¢噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
-                        if (sSubStr[i].HMaterRuleType == null || sSubStr[i].HMaterRuleType == "") {
+                        if (sSubStr[i].HMaterRuleExternType1 == null || sSubStr[i].HMaterRuleExternType1 == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍏紡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return Result = false;
                         }
@@ -2264,7 +2271,7 @@
                                 , "HCusName": data.HCusName
                                 //, "HWeight": data.HWeight
                                 , "HWaterQty": data.HWeight * HWaterRate
-                                //, "HLong": data.绫虫暟
+                                , "HLong": data.HQty
                                 //, "HMaterEmpID": data.鎵撴祮浜哄唴鐮�
                                 //, "HMaterEmpName": data.鎵撴祮浜哄悕绉�
                             });
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
index 54996b2..12d574b 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBillEdit_YangMao.html"
@@ -120,7 +120,7 @@
                                             <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo"
-                                                    id="HICMOBillNo" readonly="readonly" autocomplete="off">
+                                                    id="HICMOBillNo" autocomplete="off">
                                                 <input id="HICMOInterID" name="HICMOInterID" type="hidden" value="0" />
                                                 <input id="HICMOEntryID" name="HICMOEntryID" type="hidden" value="0" />
                                             </div>
@@ -149,11 +149,10 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">姘村啿<label style="color:red"> *
-                                                </label></label>
+                                            <label class="layui-form-label">姘村啿</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HWaterRush" id="HWaterRush" class="layui-input"
-                                                    value="" style="float:left;">
+                                                    value="0" style="float:left;">
                                             </div>
                                         </div>
                                     </div>
@@ -188,11 +187,10 @@
                                         </div>
 
                                         <div class="layui-inline">
-                                            <label class="layui-form-label">鏈洪��<label style="color:red"> *
-                                                </label></label>
+                                            <label class="layui-form-label">鏈洪��</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" name="HMachineSpeed" id="HMachineSpeed"
-                                                    class="layui-input" value="" style="float:left;">
+                                                    class="layui-input" value="0" style="float:left;">
                                             </div>
                                         </div>
                                     </div>
@@ -1443,8 +1441,8 @@
                     , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
                     , { field: 'HMoney', title: '閲戦', width: 100, hide: true }
                     , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, hide: true }
-                    , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120, hide: false }
-                    , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: false }
+                    , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120, hide: true }
+                    , { field: 'HWHName', title: '鍙戞枡浠撳簱鍚嶇О', width: 120, hide: true }
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ];
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
index 541f019..891971b 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Add_Edit_Kf_OtherInBill.html"
@@ -79,51 +79,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
-                                            </div>
-                                        </div>
-
-
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
-                                            <label class="layui-form-label">璋冨嚭浠撳簱ID</label>
-                                            <div class="layui-input-inline">
-                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </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="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </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="HEmpID" id="HEmpID" class="layui-input" value=0 style="float:left;width:150px;">
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">涓荤</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">浠撳簱</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
-                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;" readonly>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                 </button>
                                             </div>
@@ -138,8 +98,89 @@
                                                 </button>
                                             </div>
                                         </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">寰�鏉ュ崟浣�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
+                                                    <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
+                                                </select>
+
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">閫夊崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
+
+                                                <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-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">涓荤</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">璋冨嚭浠撳簱ID</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value=0 style="float:left;width:150px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline" style="display:none;">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="display:none;">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">楠屾敹鍛�</label>
                                             <div class="layui-input-inline">
@@ -160,50 +201,9 @@
                                                 </button>
                                             </div>
                                         </div>
-                                      
-                                    </div>
-
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
-                                            <div class="layui-input-inline">
-                                                <select name="HSourceBillType" lay-filter="HSourceBillType" id="HSourceBillType">
-                                                    <option value="鎵嬪伐褰曞叆" selected="selected">鎵嬪伐褰曞叆</option>
-                                                </select>
-                                               
-                                            </div>
-                                        </div>
-                                        <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">閫夊崟鍙�</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
-                                                
-                                                <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-row">
-
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">鎽樿</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-col-xs7 layui-inline">
-                                            <label class="layui-form-label">澶囨敞</label>
-                                            <div class="layui-input-block">
-                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                            </div>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
-
 
                             <!--鍒跺崟淇℃伅-->
                             <div class="layui-tab-item">
@@ -286,6 +286,10 @@
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>鎵归噺鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>搴撳瓨鏌ヨ</button>
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>鍑哄叆搴撹褰曟煡璇�</button>
                         </div>
@@ -308,7 +312,6 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-
             //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -324,13 +327,26 @@
             var shijian = year + "-" + month + "-" + day;
 
             var allVal;
+
+            var HModName = "Add_Edit_Kf_OtherInBill";
+            //闇�瑕佹壒閲忓垹闄ょ殑鍒楄〃
+            var btnBatchDeleteList = [];
             //#endregion
 
-
-            //#region 杩涘叆椤甸潰鍗冲姞杞�
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //#region 椤甸潰鍒濆鍖�
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+            //#endregion
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1203";
@@ -342,7 +358,8 @@
             //Organ();//鏄剧ず缁勭粐
             //鑾峰彇婧愬崟绫诲瀷
             //HSourceBillType();
-            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+
+            //#region 鑾峰彇椤甸潰璺宠浆鍙傛暟
             var params = get_UrlVars();
             var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
             var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
@@ -352,12 +369,60 @@
                 OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 linterid = params[params[1]];//婧愬崟id
             }
+            //#endregion
 
+            //#region 閿�鍞憳銆侀攢鍞儴闂ㄣ�侀攢鍞富绠″垵濮嬪寲
+            getCzyglByUser();
+
+            //#region 鏍规嵁璐﹀彿鑾峰彇閮ㄩ棬銆佽亴鍛樸�佷富绠�
+            function getCzyglByUser() {
+                $.ajax({
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "CurUserName": sessionStorage["HUserName"]
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+
+                            $("#HEmpID").val(data.HEmpID);
+                            $("#HEmpName").val(data.HEmpName);
+                            $("#HDeptID").val(data.HDeptID);
+                            $("#HDeptName").val(data.HDeptName);
+                            $("#HManagerID").val(data.HManagerID);
+                            $("#HManagerName").val(data.HManagerName);
+
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鏄庣粏琛屽垵濮嬪寲
+            var rowdata = [{
+                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
+                "HQtyMust": "0", "HQty": "0", "HPieceQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+            }];
+            // 鍒濆鍖栫晫
+            set_InitGrid();
+            //鍒锋柊琛ㄦ牸鏁版嵁
+            DisPlay_HideColumn();
+            //#endregion
  
-            //鍒ゆ柇鎿嶄綔绫诲瀷
+            //#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
-             
             }
             else if (OperationType == 3) {//缂栬緫
                
@@ -365,15 +430,9 @@
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
             }
-            
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-
-            //#endregion
-
-
-
 
             //鍒ゆ柇鏄惁鏂板
             if (linterid == null || linterid == 0) {
@@ -386,56 +445,557 @@
                     type: "GET",
                     data: { "HBillType": '1203' },
                     success: function (d) {
-                      
+
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                         $("#HInterID").val(d.data[0].HInterID);
                     }
                 });
-            } else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 $("#HInterID").val(linterid);
                 RoadBillMain(linterid);
             }
             //#endregion
             //#endregion
 
-            var rowdata = [{
-                "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "",   "HUnitID": 0, "璁¢噺鍗曚綅": "",   "HRemark": "",
-                "HQtyMust": "","HQty": "","HPrice": "0", "HMoney": "0",   "HWHID": 0, "鏀舵枡浠撳簱": "",
-                "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0, 
-            }];
-            // 鍒濆鍖栫晫
-            set_InitGrid();
+            //#region 鑿滃崟鏍忔搷浣滄寜閽�
+            //#region 淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
 
-            //澶村伐鍏锋爮浜嬩欢
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var ref1 = /^\d+$/;                 //姝f暣鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                //if ($("#HDeptName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+
+                //if ($("#HWHName").val() == 0) {
+                //    layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HKeeperID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if ($("#HSecManagerID").val() == 0) {
+                //    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+
+                if ($("#HSupID").val() == 0) {
+                    layer.msg("璇烽�夋嫨寰�鏉ュ崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+
+                for (var i = 0; i < option.data.length; i++) {
+                    if (option.data[i]["HMaterID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨鐗╂枡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    if (option.data[i]["HWHID"] == "0") {
+                        layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+
+                    //瀹炲彂鏁伴噺鏍煎紡鏍¢獙
+                    temp = option.data[i]["HQty"] + "";
+                    if (!ref.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炴敹鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    } else if (temp * 1 == 0) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細瀹炴敹鏁伴噺璇疯緭鍏ヤ笉涓�0鐨勬暟瀛楋紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+
+                    //浠舵暟鏍煎紡鏍¢獙
+                    temp = option.data[i]["HPieceQty"] + "";
+                    if (!ref1.test(temp)) {
+                        layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return;
+                    }
+                    //else if (temp * 1 == 0) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細浠舵暟璇疯緭鍏ヤ笉涓�0鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return false;
+                    //}
+                }
+
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+
+                //checkDuplicateData(num);
+                //const duplicateRows = checkDuplicateData(num);
+                //if (duplicateRows.length > 0) {
+                //    let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
+
+                //    for (let i = 0; i < duplicateRows.length; i++) {
+                //        const { row1, row2 } = duplicateRows[i];
+                //        message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
+
+                //        if (i !== duplicateRows.length - 1) {
+                //            message += '锛�';
+                //        }
+                //    }
+
+                //    message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
+                //    layer.alert(message);
+                //} 
+
+                //鑾峰彇鎿嶄綔鏂瑰紡
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                if (OperationType == 3) {
+                    refSav = "Update";
+                }
+
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    data.field.HUpDater = sessionStorage["HUserName"];
+                    data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpDater").val(sessionStorage["HUserName"]);
+                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                }
+
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(num);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Kf_OtherInBill/SaveKf_OtherInBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+
+                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            //ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Exit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            //#endregion
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(1);
+            });
+
+            //#region 瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
+            function set_CheckBill(num) {
+                var HInterID = $("#HInterID").val();
+                $.ajax({
+                    url: GetWEBURL() + '/Kf_OtherInBill/CheckKf_OtherInBill',
+                    type: "GET",
+                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                            });
+                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄥご鍩虹璧勬枡閫夋嫨
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            //form.on('submit(HEmpList)', function () {
+            //    get_checkEmp();
+            //});
+            //閫夋嫨渚涘簲鍟嗘寜閽�
+            //form.on('submit(HSupList)', function () {
+            //    get_checkSup();
+            //});
+
+            //#region 閫夋嫨閿�鍞憳鎸夐挳
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            //#region 閿�鍞憳閫夋嫨椤甸潰
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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);
+
+                        getEmpInfoByHEmpID(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        $("#HEmpName").val("");
+                        $("#HEmpID").val("0");
+
+                        $("#HDeptID").val("0");
+                        $("#HDeptName").val("");
+                    }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨涓荤鎸夐挳
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+
+            //#region 涓荤閫夋嫨椤甸潰
+            function get_checkManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓荤鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+
+            //#region 浠撳簱閫夋嫨椤甸潰
+            function get_checkWH() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+
+                        if (option.data.length > 0) {
+                            for (var i = 0; i < option.data.length; i++) {
+                                if (option.data[i]["HWHID"] == 0) {
+                                    option.data[i]["HWHID"] = checkStatus.data[0].HItemID;
+                                    option.data[i]["鏀舵枡浠撳簱"] = checkStatus.data[0].浠撳簱鍚嶇О;
+                                }
+                            }
+                        }
+                        table.render(option);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+
+            //#region 楠屾敹鍛橀�夋嫨椤甸潰
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '楠屾敹鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+
+            //#region 淇濈鍛橀�夋嫨椤甸潰
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '淇濈鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            //#region 閮ㄩ棬閫夋嫨椤甸潰
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 閫夋嫨瀹㈡埛鎸夐挳
+            form.on('submit(HSupList)', function () {
+                get_checkCus();
+            });
+
+            //#region 瀹㈡埛閫夋嫨椤甸潰
+            function get_checkCus() {
+                var HEmpID = $("#HEmpID").val();
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟瀹㈡埛鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_CustomerList.html?Type=1&openType=3&HEmp=' + HEmpID, '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('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        $("#HSupName").val(checkStatus.data[0].HName);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
+            form.on('submit(XDHList)', function () {
+
+                if ($("#HSourceBillType").val() != 0 && $("#HSourceBillType").val() !== null) {
+                    return layer.msg('浣犻�夋嫨鐨勬簮鍗曚笉瀛樺湪');
+                }
+                var url = getSupType().url;
+                url = encodeURI(url);
+
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: '' + getSupType().name + '鍒楄〃'  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [url, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鎸夐挳涓�  鐨勫洖璋�
+                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                        if (checkStatus.data.length == 0) {
+                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
+                        }
+                        layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+                        //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
+                        var ProcessNumber = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            ProcessNumber.push(checkStatus.data[i]);
+                        }
+
+                        //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+                        var NowNum = 0;
+                        NowNum = option.data.length;
+
+                        if (getSupType().name == "閲囪喘璁㈠崟") {
+                            var j = 0;
+                            for (var i = 0; i < checkStatus.data.length; i++) {
+                                option.data.push({
+                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
+                                    "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
+                                    "HMoney": checkStatus.data[j].閲戦,
+                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                })
+                                j++;
+                            }
+                            table.render(option);
+                            layer.close(index);
+                        } else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
+                            var j = 0;
+                            for (var i = 0; i < ProcessNumber.length; i++) {
+                                option.data.push({
+                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
+                                    "   ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": "", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
+                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦, "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
+                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
+                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
+                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
+                                })
+                                j++;
+                            }
+                            table.render(option);
+                            layer.close(index);//鍏抽棴寮圭獥
+                        }
+
+                    }
+
+                });
+            });
+            //#endregion
+            //#endregion
+
+            //#region 琛ㄦ牸鐩戝惉浜嬩欢
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 //鏂板琛岃〃鏍兼暟鎹�
                 var NewRow = {
                     "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HRemark": "",
-                    "HQtyMust": "", "HQty": "", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
+                    "HQtyMust": "0", "HQty": "0","HPieceQty": "0", "HPrice": "0", "HMoney": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
                     "HSPID": 0, "HSPGroupID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
                     "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
                     "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                 };
                 switch (obj.event) {
-                    //搴撳瓨鏌ヨ
-                    case 'get_Inventory': get_Inventory();
-                        break;
-                    //鍑哄叆搴撹褰曟煡璇�
-                    case 'get_InOutSum': get_InOutSum();
-                        break;
+                    //鏂板
                     case 'btn-AddLine':
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
-
                         table.render(option);
-                        //鍒锋柊澶嶉�夋
-                        //checkRefresh();
                         break;
+                    //澶嶅埗
                     case 'btn-CopyLine':
                         var copydata = JSON.stringify(data);
                         if (data.length <= 0) {
@@ -454,87 +1014,257 @@
                             //checkRefresh();
                         }
                         break;
-                  
+                    //涓婄Щ
+                    case 'btn-Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn-Under': btn_under();
+                        break;
+                    //鎵归噺鍒犻櫎
+                    case 'btn-batchDelete': btn_batchDelete();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    //搴撳瓨鏌ヨ
+                    case 'get_Inventory': get_Inventory();
+                        break;
+                    //鍑哄叆搴撹褰曟煡璇�
+                    case 'get_InOutSum': get_InOutSum();
+                        break;
                 }
             });
 
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                Pub_Close(1);
-            })
-
-            //閫夋嫨涓氬姟鍛樻寜閽�
-            //form.on('submit(HEmpList)', function () {
-            //    get_checkEmp();
-            //});
-            //閫夋嫨渚涘簲鍟嗘寜閽�
-            //form.on('submit(HSupList)', function () {
-            //    get_checkSup();
-            //});
-
-            //閫夋嫨涓荤鎸夐挳
-            form.on('submit(HManagerList)', function () {
-                get_checkManager();
-            });
-            //閫夋嫨浠撳簱鎸夐挳
-            form.on('submit(HWHList)', function () {
-                get_checkWH();
-            });
-            //閫夋嫨楠屾敹鍛樻寜閽�
-            form.on('submit(HSecManagerList)', function () {
-                get_checkSecManager();
-            });
-            //閫夋嫨淇濈鍛樻寜閽�
-            form.on('submit(HKeeperList)', function () {
-                get_checkKeeper();
-            });
-            //閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(HDeptList)', function () {
-                get_checkDept();
-            });
-
-            
-
-
-            //淇濆瓨鎸夐挳
-            form.on('submit(set_SaveBill)', function (data) {
-                set_SaveBill(data);
-            });
-
-            //#region 瀹℃牳鎸夐挳
-            form.on('submit(set_CheckBill)', function (data) {
-                set_CheckBill(1);
-            });
-            //#endregion
-
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
-                var data = obj.data;
-                if (obj.event == 'HDate') {
-                    var field = $(this).data('field');
-                    laydate.render({
-                        elem: this.firstChild
-                        , show: true //鐩存帴鏄剧ず
-                        , closeStop: this
-                        , done: function (nowDate) {
-                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
-                            data[field] = nowDate;
-                            obj.update(data);
-                            //鍒锋柊澶嶉�夋
-                            //checkRefresh();
+            //#region 涓婄Щ
+            function btn_up() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄涓�琛屼笂绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == 0) {
+                                layer.msg("绗竴琛屾暟鎹棤娉曚笂绉伙紒");
+                                return;
+                            }
+                            tables.push(option.data[i - 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i - 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
                         }
-                    });
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
                 }
-            });
-
-
+            }
             //#endregion
+
+            //#region 涓嬬Щ
+            function btn_under() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 1) {
+                    var tables = [];
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            //濡傛灉鏄渶鍚庝竴琛屼笅绉伙紝鍒欏け璐ュ苟鎻愰啋
+                            if (i == option.data.length - 1) {
+                                layer.msg("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉伙紒");
+                                return;
+                            }
+
+
+                            tables.push(option.data[i + 1]);
+                            data[0].LAY_CHECKED = true;
+                            option.data[i + 1] = data[0];
+                            option.data[i] = tables[0];
+                            table.render(option);
+                            break;
+                        }
+                    }
+                } else {
+                    layer.msg("璇烽�夋嫨涓�琛屾暟鎹紒");
+                }
+            }
+            //#endregion
+
+            //#region 鎵归噺鍒犻櫎
+            function btn_batchDelete() {
+                var data = [];
+                for (var i = 0; i < option.data.length; i++) {
+                    if ($.inArray(i + "", btnBatchDeleteList) == -1) {
+                        data.push(option.data[i]);
+                    }
+                }
+                option.data = data;
+                table.render(option);
+
+                btnBatchDeleteList = [];
+            }
+
+            //#region 鐩戝惉澶嶉�夋閫変腑浜嬩欢
+            table.on('checkbox(mainTable)', function (obj) {
+                //鑾峰彇閫変腑琛岀殑绱㈠紩鍒楄〃
+                var rowIndex = $(obj.tr).attr("data-index");
+
+                if (typeof (rowIndex) == "undefined") {
+                    if (btnBatchDeleteList.length == option.data.length) {
+                        btnBatchDeleteList = [];
+                    } else {
+                        btnBatchDeleteList = [];
+                        for (var i = 0; i < option.data.length; i++) {
+                            btnBatchDeleteList.push(i + "");
+                        }
+                    }
+                } else {
+                    if ($.inArray(rowIndex, btnBatchDeleteList) > -1) {
+                        var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                        btnBatchDeleteList = btnBatchDeleteList_New;
+                    } else {
+                        btnBatchDeleteList.push(rowIndex);
+                    }
+                }
+                console.log(btnBatchDeleteList);
+            });
+            //#endregion
+            //#endregion
+
+            //#region 瀛愯〃1锛氶殣钘忓垪璁剧疆
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 瀛愯〃1锛氭樉绀哄垪鏁版嵁
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    async: false,
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = ["HMaterID", "HUnitID", "鎶樻墸鐜�", "瀹為檯鍚◣鍗曚环", "绋庨", "鏈綅甯佷环绋庡悎璁�", "鍑哄簱鏁伴噺", "寮�绁ㄦ暟閲�", "HOrderLevID", "璁㈠崟绛夌骇浠g爜", "閿�鍞嚭搴撴暟閲�", "閿�鍞嚭搴撳鏍告暟閲�", "閿�鍞嚭搴撳鏍搁噾棰�", "鐢熶骇鏁伴噺", "閿�鍞��搴撴暟閲�", "閿�鍞��搴撳鏍告暟閲�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+                            titleData = [];
+
+                            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;
+                                }
+                                if ($.inArray(option.cols[0][i + 1]["title"], titleData) > -1) {
+                                    option.cols[0][i + 1]["hide"] = 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];
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
             //#region 搴撳瓨鏌ヨ
             function get_Inventory() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -560,6 +1290,7 @@
                 }
             }
             //#endregion
+
             //#region 鍑哄叆搴撹褰曟煡璇�
             function get_InOutSum() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -583,6 +1314,275 @@
                     layer.msg('璇烽�夋嫨涓�琛屾湁鐗╂枡鏁版嵁鏌ヨ锛�');
                 }
             }
+            //#endregion
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //#region 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            option.data = oldData;
+                            table.render(option);
+
+                            //鏇存柊鎵归噺鍒犻櫎绱㈠紩鍒楄〃
+                            var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
+                            btnBatchDeleteList = btnBatchDeleteList_New;
+                            for (var i = 0; i < btnBatchDeleteList.length; i++) {
+                                if (btnBatchDeleteList[i] * 1 > rowIndex * 1) {
+                                    btnBatchDeleteList[i] = (btnBatchDeleteList[i] * 1 - 1) + "";
+                                }
+                            }
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 琛屽唴蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鐗╂枡
+                        if (obj.event == "HMaterID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鐗╂枡鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID,
+                                        "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜,
+                                        "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
+                                        "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿,
+                                        "HUnitID": checkStatus.data[0].HUnitID,
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HMaterID": OptionData.HMaterID
+                                    //    , "鐗╂枡浠g爜": OptionData.鐗╂枡浠g爜
+                                    //    , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+                                    //    , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+                                    //    , "HUnitID": OptionData.HUnitID
+                                    //    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    //})
+                                }
+                            });
+                        }
+                        //璁¢噺鍗曚綅
+                        if (obj.event == "HUnitID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+
+
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HUnitID": checkStatus.data[0].HItemID,
+                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HUnitID": OptionData.HItemID
+                                    //    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+                        //鏀舵枡浠撳簱
+                        if (obj.event == "HWHID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "鏀舵枡浠撳簱鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HWHID": checkStatus.data[0].HItemID,
+                                        "鏀舵枡浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HWHID": OptionData.HItemID
+                                    //    , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+                        //浠撲綅
+                        if (obj.event == "HSPID") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSPID": checkStatus.data[0].HMainID,
+                                        "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HSPID": OptionData.HMainID
+                                    //    , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+
+                        //閲囪喘璁㈠崟鍙�
+                        if (obj.event == "HPOOrderBillNo") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閲囪喘璁㈠崟鍒楄〃"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+                                        "HPOOrderInterID": checkStatus.data[0].hmainid,
+                                        "HPOOrderEntryID": checkStatus.data[0].hsubid,
+                                        "HPOOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        //閿�鍞鍗曞彿
+                        if (obj.event == "HSeOrderBillNo") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim" //鍔犱笂杈规
+                                , title: "閿�鍞鍗曞垪琛�"  //鏍囬
+                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2 //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"] //绐椾綋澶у皬
+                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
+                                , btn: ["纭畾", "鍙栨秷"]
+                                , btn1: function (index, laero) {
+                                    //鎸夐挳涓�  鐨勫洖璋�
+                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+                                    if (checkStatus.data.length != 1) {
+                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                    obj.update({
+
+                                        "HSeOrderInterID": checkStatus.data[0].hmainid,
+                                        "HSeOrderEntryID": checkStatus.data[0].hsubid,
+                                        "HSeOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
             //#endregion
 
             //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
@@ -688,23 +1688,9 @@
             });
             //#endregion
             //#endregion
-            //#endregion
-
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
-            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            function get_LoginIs() {
-                if (sessionStorage.login != "login") {
-                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                    }, function () { window.location.href = "../../user/login.html"; });
-                }
-            }
-            //#endregion
-
-
-            //鑾峰彇缁勭粐
+            //#region 鑾峰彇缁勭粐
             function Organ() {
                 //鑾峰彇鐧诲綍椤电粍缁囧垪
                 var Organization = '';
@@ -725,8 +1711,9 @@
                     }
                 })
             }
+            //#endregion
 
-            //鏃ユ湡鏍煎紡鍖�
+            //#region 鏃ユ湡鏍煎紡鍖�
             function formatDate(date) {
                 var d = new Date(date),
                     month = '' + (d.getMonth() + 1),
@@ -738,10 +1725,9 @@
 
                 return [year, month, day].join('-');
             }
+            //#endregion
 
-
-            //瀛愯〃
-
+            //#region 瀛愯〃鍒濆鍖�
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
@@ -765,8 +1751,9 @@
                         //, { field: '鐗╂枡杈呭姪灞炴��', title: '鐗╂枡杈呭姪灞炴��', width: 150, edit: 'text'}//f7
                         , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
                         , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 100, edit: 'text', event: "HUnitID" }//f7
-                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, edit: 'text', totalRow: true}
-                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 150, edit: 'text', totalRow: true}
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150, totalRow: true}
+                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 150, edit: 'text', totalRow: true }
+                        , { field: 'HPieceQty', title: '浠舵暟', width: 150, edit: 'text', totalRow: true }
                         , { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
                         , { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
                      
@@ -791,6 +1778,7 @@
                 option.data = [];
                 table.render(option);
             }
+            //#endregion
 
             //#region 鍔犺浇琛ㄥご
             function RoadBillMain(linterid) {
@@ -798,6 +1786,7 @@
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + "Kf_OtherInBill/Kf_OtherInBillEdit",
+                    async:false,
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -813,7 +1802,8 @@
                                 , "HDate": formatDate(data[0]["鏃ユ湡"])
                                 , "HInnerBillNo": data[0]["鍐呴儴鍗曟嵁鍙�"]
                                
-                                
+                                , "HSupID": data[0]["HSupID"]
+                                , "HSupName": data[0]["寰�鏉ュ崟浣�"]
                                 , "HWHID": data[0]["HWHID"]
                                 , "HWHName": data[0]["浠撳簱"]
                                 , "HSecManagerID": data[0]["HSecManagerID"]
@@ -824,6 +1814,8 @@
                                 , "HDeptID": data[0]["HDeptID"]
                                 , "HManagerID": data[0]["HManagerID"]
                                 , "HMangerName": data[0]["涓荤"]
+                                , "HEmpID": data[0]["HEmpID"]
+                                , "HEmpName": data[0]["涓氬姟鍛�"]
                                 , "HExplanation": data[0]["HExplanation"]
 
                                 , "HRemark": data[0]["琛ㄥご澶囨敞"]
@@ -857,496 +1849,6 @@
                 });
             }
             //#endregion
-       
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {
-                if (linterid == undefined) {
-                    //鍏抽棴椤电
-                    Pub_Close(2);
-                }
-                else {
-                    //鍏抽棴椤电
-                    Pub_Close(1);
-                }
-            });
-
-            //瀹℃牳   [1 瀹℃牳銆�2 鍙嶅鏍竇
-            function set_CheckBill(num) {
-                var HInterID = $("#HInterID").val();
-                $.ajax({
-                    url: GetWEBURL() + '/Kf_OtherInBill/CheckKf_OtherInBill',
-                    type: "GET",
-                    data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"] },
-                    success: function (result) {
-                        if (result.count == 1) {
-                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                // 寰楀埌frame绱㈠紩
-                                var index = layer.getFrameIndex(window.name);
-                                //鍏抽棴褰撳墠frame
-                                layer.close(index);
-                            });
-                            $('#check-btn').addClass("layui-btn-disabled").attr("disabled", true);// 绂佺敤瀹℃牳鎸夐挳
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-           
-            //#region 淇濆瓨鏂规硶
-            function set_SaveBill(data) {
-               
-                if ($("#HDeptName").val() == 0) {
-                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-               
-                if ($("#HWHName").val() == 0) {
-                    layer.msg("璇烽�夋嫨浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HKeeperID").val() == 0) {
-                    layer.msg("璇烽�夋嫨淇濈鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if ($("#HSecManagerID").val() == 0) {
-                    layer.msg("璇烽�夋嫨楠屾敹鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-
-
-                var num = [];
-                for (var i = 0; i < table.cache["mainTable"].length; i++) {
-                    if (table.cache["mainTable"][i] != "") {
-                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
-                        num.push(table.cache["mainTable"][i])
-                    }
-                }
-
-                //checkDuplicateData(num);
-                //const duplicateRows = checkDuplicateData(num);
-                //if (duplicateRows.length > 0) {
-                //    let message = '琛ㄦ牸涓瓨鍦ㄩ噸澶嶆暟鎹紝閲嶅琛屾暟涓猴細';
-
-                //    for (let i = 0; i < duplicateRows.length; i++) {
-                //        const { row1, row2 } = duplicateRows[i];
-                //        message += `绗�${row1}琛屼笌绗�${row2}琛岀浉鍚宍;
-
-                //        if (i !== duplicateRows.length - 1) {
-                //            message += '锛�';
-                //        }
-                //    }
-
-                //    message += '锛岃鍒犻櫎鍏朵腑涓�琛�';
-                //    layer.alert(message);
-                //} 
-
-                //鑾峰彇鎿嶄綔鏂瑰紡
-                var refSav = "";
-                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
-                    refSav = "Add";
-                }
-                if (OperationType == 3) {
-                    refSav = "Update";
-                }
-
-                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
-                if (OperationType == 3) {
-                    data.field.HUpDater = sessionStorage["HUserName"];
-                    data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd");
-                    $("#HUpDater").val(sessionStorage["HUserName"]);
-                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
-                }
-
-
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(num);
-                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
-
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "Kf_OtherInBill/SaveKf_OtherInBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainSub },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { icon: 1 });
-
-                            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                            //淇濆瓨鍚庢祻瑙�
-                            //ReRoadBillMain();
-                        }
-                        else {
-                            layer.alert(data.Message, { icon: 5 });
-                        }
-                        layer.closeAll("loading");
-                    },
-                    error: function (err) {
-                        layer.alert("閿欒:" + err, { icon: 5 });
-                        console.log("Reason" + sMainStr);
-                    }
-                });
-            }
-            //#endregion
-          
-            ////#endregion
-
-              //#region  浠撳簱 閮ㄩ棬 淇濈鍛� 涓荤 楠屾敹鍛�
-
-            //浠撳簱
-            function get_checkWH() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '浠撳簱鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', '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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
-                        $("#HWHID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //楠屾敹鍛�
-            function get_checkSecManager() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '楠屾敹鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //淇濈鍛�
-            function get_checkKeeper() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '淇濈鍛樺垪琛�'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //閮ㄩ棬
-            function get_checkDept() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , 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(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-            //涓荤
-           function get_checkManager() {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '涓荤鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HMangerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
-                        $("#HManagerID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            }
-
-             //#endregion
-
-            //琛屽唴蹇嵎閿瓫閫�
-            function set_GridCellCheck(obj) {
-                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
-                    if (event.key == "F7") {
-                        //鐗╂枡
-                        if (obj.event == "HMaterID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "鐗╂枡鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-
-                                  
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HMaterID": checkStatus.data[0].HItemID,
-                                        "鐗╂枡浠g爜": checkStatus.data[0].鐗╂枡浠g爜,
-                                        "鐗╂枡鍚嶇О": checkStatus.data[0].鐗╂枡鍚嶇О,
-                                        "瑙勬牸鍨嬪彿": checkStatus.data[0].瑙勬牸鍨嬪彿,
-                                        "HUnitID" : checkStatus.data[0].HUnitID,
-                                        "璁¢噺鍗曚綅" :checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                 ,end: function () {
-                                    obj.update({
-                                     "HMaterID" :OptionData.HMaterID
-                                        ,"鐗╂枡浠g爜" : OptionData.鐗╂枡浠g爜
-                                       , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
-                                        ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
-                                        ,"HUnitID" :OptionData.HUnitID
-                                        ,"璁¢噺鍗曚綅" : OptionData.璁¢噺鍗曚綅鍚嶇О
-                                })
-                                }
-                            });
-                        }
-                        //璁¢噺鍗曚綅
-                        if (obj.event == "HUnitID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "璁¢噺鍗曚綅鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-
-                                    
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        
-                                        "HUnitID": checkStatus.data[0].HItemID,
-                                        "璁¢噺鍗曚綅": checkStatus.data[0].璁¢噺鍗曚綅鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                               , end: function () {
-                                obj.update({
-                                    "HUnitID": OptionData.HItemID
-                                    , "璁¢噺鍗曚綅": OptionData.璁¢噺鍗曚綅鍚嶇О
-                                })
-                            }
-                            })
-                        }
-                        //鏀舵枡浠撳簱
-                        if (obj.event == "HWHID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "鏀舵枡浠撳簱鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        
-                                        "HWHID": checkStatus.data[0].HItemID,
-                                        "鏀舵枡浠撳簱": checkStatus.data[0].浠撳簱鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                             , end: function () {
-                                 obj.update({
-                                    "HWHID": OptionData.HItemID
-                                    , "鏀舵枡浠撳簱": OptionData.浠撳簱鍚嶇О
-                                })
-                            }
-                            })
-                        }
-                        //浠撲綅
-                        if (obj.event == "HSPID") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "浠撲綅鍚嶇О鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                       
-                                        "HSPID": checkStatus.data[0].HItemID,
-                                         "浠撲綅鍚嶇О": checkStatus.data[0].浠撲綅鍚嶇О
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                                , end: function () {
-                                obj.update({
-                                    "HSPID": OptionData.HMainID
-                                    , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
-                                })
-                            }
-                            })
-                        }
-                       
-                        //閲囪喘璁㈠崟鍙�
-                        if (obj.event == "HPOOrderBillNo") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "閲囪喘璁㈠崟鍒楄〃"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-                                        "HPOOrderInterID": checkStatus.data[0].hmainid,
-                                        "HPOOrderEntryID": checkStatus.data[0].hsubid,
-                                        "HPOOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                            })
-                        }
-                        //閿�鍞鍗曞彿
-                        if (obj.event == "HSeOrderBillNo") {
-                            layer.open({
-                                type: 2
-                                , skin: "layui-layer-rim" //鍔犱笂杈规
-                                , title: "閿�鍞鍗曞垪琛�"  //鏍囬
-                                , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                                , shift: 2 //寮瑰嚭鍔ㄧ敾
-                                , area: ["90%", "90%"] //绐椾綋澶у皬
-                                , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                                , content: ['../../閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html', 'yes']
-                                , btn: ["纭畾", "鍙栨秷"]
-                                , btn1: function (index, laero) {
-                                    //鎸夐挳涓�  鐨勫洖璋�
-                                    var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                                    if (checkStatus.data.length != 1) {
-                                        return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
-                                    }
-                                    //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
-                                    obj.update({
-
-                                        "HSeOrderInterID": checkStatus.data[0].hmainid,
-                                        "HSeOrderEntryID": checkStatus.data[0].hsubid,
-                                        "HSeOrderBillNo": checkStatus.data[0].鍗曟嵁鍙�
-                                    })
-                                    layer.close(index);//鍏抽棴寮圭獥
-                                }
-                            })
-                        }
-                        obj.event = "";
-                        return false;
-                    }
-                })
-            }
-
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                set_GridDelete(obj);   //琛屽唴鍒犻櫎
-                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
-
-            });
 
             //#region 鍔ㄦ�佸脊鍑洪〉闈�
             function getSupType() {
@@ -1359,130 +1861,6 @@
                         return { url: "../../閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html", name: "鏀舵枡閫氱煡鍗�" };
                         break;
                 }
-            }
-           //#endregion
-
-            //琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
-            form.on('submit(XDHList)', function () {
-
-                if ($("#HSourceBillType").val() != 0 && $("#HSourceBillType").val()!== null) {
-                    return layer.msg('浣犻�夋嫨鐨勬簮鍗曚笉瀛樺湪');
-                }
-                var url = getSupType().url;
-                url = encodeURI(url);
-
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2
-                    , skin: "layui-layer-rim" //鍔犱笂杈规
-                    , title: '' + getSupType().name + '鍒楄〃'  //鏍囬
-                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
-                    , shift: 2 //寮瑰嚭鍔ㄧ敾
-                    , area: ["90%", "90%"] //绐椾綋澶у皬
-                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
-                    , content: [url, "yes"]
-                    , btn: ["纭畾", "鍙栨秷"]
-                    , btn1: function (index, laero) {
-                        //鎸夐挳涓�  鐨勫洖璋�
-                        var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
-                        if (checkStatus.data.length == 0) {
-                            return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
-                        }
-                        layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
-                        //鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
-                        var ProcessNumber = [];
-                        for (var i = 0; i < checkStatus.data.length; i++) {
-                            ProcessNumber.push(checkStatus.data[i]);
-                        }
-
-                        //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
-                        var NowNum = 0;
-                        NowNum = option.data.length;
-
-                        if (getSupType().name == "閲囪喘璁㈠崟") {
-                            var j = 0;
-                            for (var i = 0; i < checkStatus.data.length; i++) {
-                                option.data.push({
-                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅,
-                                    "HQty": checkStatus.data[j].鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
-                                    "HMoney": checkStatus.data[j].閲戦,
-                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                })
-                                j++;
-                            }
-                            table.render(option);
-                            layer.close(index);
-                        } else if (getSupType().name =="鏀舵枡閫氱煡鍗�") {
-                            var j = 0;
-                            for (var i = 0; i < ProcessNumber.length; i++) {
-                                option.data.push({
-                                    "HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠g爜": checkStatus.data[j].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
-                                    "   ": 0, "鐗╂枡杈呭姪灞炴��": "", "HUnitID": checkStatus.data[j].HUnitID, "璁¢噺鍗曚綅": checkStatus.data[j].璁¢噺鍗曚綅, "HQtyMust": "", "HQty": checkStatus.data[j].鏁伴噺, "HRemark": "",
-                                    "HPrice": checkStatus.data[j].鍗曚环, "HMoney": checkStatus.data[j].閲戦,   "HWHID": checkStatus.data[j].HWHID, "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,
-                                    "HSPID": checkStatus.data[j].HSPID, "浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О, "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
-                                    "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
-                                    "HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
-                                })
-                                j++;
-                            }
-                            table.render(option);
-                            layer.close(index);//鍏抽棴寮圭獥
-                        }
-                        
-                    }
-                       
-                });
-            });
-            //鍒ゆ柇鎵�閫夌潃涓庤〃鏍兼槸鍚︽湁閲嶅鏁版嵁
-            function checkDuplicateData(data) {
-                const duplicates = [];
-
-                for (let i = 0; i < data.length; i++) {
-                    const currentItem = data[i];
-                    let isDuplicate = false;
-
-                    for (let j = i + 1; j < data.length; j++) {
-                        const compareItem = data[j];
-
-                        if (currentItem.HSourceInterID === compareItem.HSourceInterID && currentItem.HSourceEntryID === compareItem.HSourceEntryID) {
-                            isDuplicate = true;
-                            duplicates.push({ row1: i + 1, row2: j + 1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁�
-                        }
-                    }
-                    if (isDuplicate && !duplicates.some(item => item.row1 === i + 1)) {
-                        duplicates.push({ row1: i + 1, row2: -1 }); // 璁板綍閲嶅鏁版嵁鎵�鍦ㄨ鏁帮紝-1 琛ㄧず鏈壘鍒颁笌褰撳墠琛岄噸澶嶇殑琛�
-                    }
-                }
-                return duplicates;
-            }
-            //琛屽唴鍒犻櫎
-            function set_GridDelete(obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            obj.del();
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.reload(option);
-                            layer.close(index);
-                        }
-                    });
-                }
-            }
-            
-
-            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
-            function ReRoadBillMain() {
-                location.replace('Add_Edit_Kf_POStockInBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
-                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
-                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
             }
             //#endregion
 
@@ -1510,12 +1888,9 @@
             }
             //#endregion
             //#endregion
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
         });
 
-         function GetHWHValue(obj)  //杩斿洖浠撳簱
+        function GetHWHValue(obj)  //杩斿洖浠撳簱
         {
             $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
             $("#HWHID").val(obj[0].HItemID);
@@ -1539,32 +1914,69 @@
             $("#HKeeperID").val(obj[0].HItemID);
         }
 
-       function GetHManagerValue(obj)  //杩斿洖涓荤
+        function GetHManagerValue(obj)  //杩斿洖涓荤
         {
             $("#HMangerName").val(obj[0].鑱屽憳鍚嶇О);
             $("#HManagerID").val(obj[0].HItemID);
-        } 
+        }
+        // 鍩虹璧勬枡杩斿洖鏁版嵁
+        function GetHEmpValue(obj)  //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
 
-          //鍙屽嚮杩斿洖鐗╂枡
-         function GetGyMaterial(data) {
-             OptionData = data
-         }
-           //鍙屽嚮杩斿洖璁¢噺鍗曚綅
-         function GetGyUnit(data) {
-             OptionData = data
-         }
+            getEmpInfoByHEmpID(obj[0].HItemID)
+        }
+        //鍙屽嚮杩斿洖鐗╂枡
+        function GetGyMaterial(data) {
+            OptionData = data
+        }
+        //鍙屽嚮杩斿洖璁¢噺鍗曚綅
+        function GetGyUnit(data) {
+            OptionData = data
+        }
 
-           //鍙屽嚮杩斿洖鏀舵枡浠撳簱
-         function GetGyWarehouse(data) {
-             OptionData = data
-         } 
+        //鍙屽嚮杩斿洖鏀舵枡浠撳簱
+        function GetGyWarehouse(data) {
+            OptionData = data
+        }
 
 
         //鍙屽嚮杩斿洖鏀舵枡浠撲綅
-         function GetGyStockPlace(data) {
-             OptionData = data
-         } 
-       
+        function GetGyStockPlace(data) {
+            OptionData = data
+        }
+
+        function GetHSupValue(obj)  //杩斿洖瀹㈡埛
+        {
+            $("#HSupName").val(obj[0].HName);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        //#region 鏍规嵁鑱屽憳鑾峰彇閮ㄩ棬
+        function getEmpInfoByHEmpID(HEmpID) {
+            $.ajax({
+                url: GetWEBURL() + "/Xs_SeOrderBill/getEmpInfoByHEmpID",
+                async: false,
+                type: "GET",
+                data: {
+                    "HEmpID": HEmpID
+                },
+                success: function (result) {
+                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data[0];
+
+                        $("#HDeptID").val(data.HDeptID);
+                        $("#HDeptName").val(data.HDeptName);
+                    } else {
+                        layer.alert(result.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
index 76fcdf2..50dc24f 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBillList.html"
@@ -496,6 +496,9 @@
                         var HBillType = "1203";
                         get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
+                    //鎵撳嵃
+                    case 'btn-print': get_print();
+                        break;
                 };
             });
 
@@ -808,6 +811,29 @@
             }
             //#endregion
 
+            //鎵撳嵃
+            function get_print() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    var hmainid = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '鎵撳嵃妯$増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid + '&MyMsg=' + HBillNo + '&Type=Kf_OtherInBillList', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                }
+            }
+
             //闅愯棌鍒楄缃�
             function get_HideColumn() {
                 var colName = "";
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 3998d2d..2186ab0 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"
@@ -60,6 +60,14 @@
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁勭粐</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <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>
@@ -454,6 +462,7 @@
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
+                Organ();
             }
 
              //鍒濆鍖栬〃鏍�
@@ -663,6 +672,7 @@
                 var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
                 var Warehouse = $("#Warehouse").val();//浠撳簱
                 var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+                var HUSEORGID = $("#HUSEORGID").val();
          //浠绘剰瀛楁杩囨护
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
@@ -770,6 +780,9 @@
                 if (Hmaker) {
                     sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
                 }
+                if (HUSEORGID && HUSEORGID!=0) {
+                    sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
+                }
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -795,7 +808,28 @@
                 });
             })
             //#endregion
-
+            //#region 鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.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].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
 
          //鍒犻櫎
             function set_DeleteBill() {
@@ -1036,6 +1070,7 @@
                 $("#ColName2").val();//澶嶉�夋
                 $("#Comparator2").val()
                 $("#ColContent2").val();
+                $("#HUSEORGID").val("");
                 form.render('select');
                 sWhere = "";
             }

--
Gitblit v1.9.1