From eddde663cbe07194ce9345bd1f434a7989dae7d3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 11 十二月 2025 16:53:14 +0800
Subject: [PATCH] 1

---
 WebTM/layuiadmin/modules/tableSelect.js                                      |   72 
 WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html                            |    2 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user                           |  280 
 WebTM/views/模治具管理/模治具管理/Gy_MaterialMouldBillMainList.html                    |   30 
 WebTM/views/模治具管理/模治具管理/Add_Edit_Gy_QCVerificationBill.html                  | 1126 ++
 WebTM/views/模治具管理/器具调拨申请单/Sc_MouldMoveStockRequestBillList.html              |   16 
 WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysisReport.html               |    6 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage.html     |    2 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                                    | 1640 ++-
 WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html                  |  325 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkPackage_Sec.html | 1180 ++
 WebTM/views/模治具管理/模治具管理/Gy_QCVerificationBillMain.html                       | 1296 +++
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs      |   17 
 WebTM/views/Baseset/基础资料/saomazutuo_xiaowei.html                             |  131 
 WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html                              |    9 
 WebTM/views/基础资料/基础资料/Gy_CarTypeList.html                                    |   64 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html                       |   21 
 WebTM/views/质量管理/质量报表/QC_MeasuringToolsyWarningReport.html                   |  397 
 WebTM/views/车间管理/报表分析/Kf_WorkShopICStockBillList.html                        |   95 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html                  |    7 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_generateSNCode.html   |  109 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Driver.html                              |  590 +
 WebTM/views/质量管理/来料检验单/QC_Add_Edit_POStockInCheckBillList.html               |    9 
 WebTM/views/车间管理/报表分析/Mes_OrderProcFlowAllReport_TK.html                     |   39 
 WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html                            |    7 
 WebTM/views/基础资料/公用基础资料/Gy_CarList.html                                      |   56 
 WebTM/views/车间管理/产线/MES_ProductionLinePackaging_MXG.html                     |  112 
 WebTM/layuiadmin/Scripts/webConfig.js                                        |    8 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillList.html                      | 1622 ++-
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ItemMoney.html                           |  382 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html                           |   65 
 WebTM/views/车间管理/报表分析/Sc_AllowedPrintProcExchangeBillList.html               |    2 
 WebTM/WebTM.csproj                                                           |   21 
 WebTM/views/WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA_XiaBao.html                    |    2 
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html              |   32 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_checkSN.html          |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBillEdit.html                      | 2415 +++++
 WebTM/views/user/login.html                                                  |    2 
 WebTM/views/WMS扫码模块/找货上架单/Kf_MaterialUpperBill_PDA.html                      |   10 
 WebTM/views/模治具管理/模治具管理/BatchGen_MouldFile.html                              |    2 
 WebTM/views/grf/香囊模板JSON.grf                                                 |   87 
 WebTM/views/基础资料/公用基础资料/Gy_DriverList.html                                   | 1359 +++
 WebTM/views/车间管理/单品过站_小卫/Cj_SachetBarCodePrint.html                          |  483 +
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_batchKeyElement.html  |    4 
 WebTM/views/模治具管理/模治具管理/KF_BarCodeStatusChangeBill.html                      |  252 
 WebTM/views/grf/蓝牙条码标签_小卫.grf                                                |   87 
 WebTM/views/质量管理/产品入库检验单/QC_LastPieceCheckBill_v2.html                       |    9 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement_Sec.html   | 1182 ++
 WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html                              |   90 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html                      | 2220 +++++
 WebTM/views/生产管理/日计划基础资料/JIT_NeedMaterPlanConfigBillList.html                |   83 
 WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillList.html                    | 1221 ++
 WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html                  |    3 
 WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html                                   |    7 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html                                |   65 
 WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html                              |   15 
 WebTM/views/车间管理/单品过站_小卫/Cj_ProcessItemStationPlatform_KeyElement.html       |    4 
 WebTM/WebTM.csproj.user                                                      |   37 
 WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillEdit.html                    | 1125 ++
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html                             |   71 
 WebTM/Vlog/webapi20251204.txt                                                |   35 
 WebTM/views/基础资料/公用基础资料/xmlLBM_Sc_ProcessExchangeBillList_stock.aspx         |   31 
 WebTM/views/基础资料/公用基础资料/Gy_ItemMoney.html                                    | 1083 ++
 WebTM/views/车间管理/单品过站_小卫/Cj_SaveSNByICMO.html                                |  259 
 WebTM/views/生产管理/制造周期报表/Sc_ProductionCycleBillList.html                      |   12 
 WebTM/views/车间管理/单品过站_小卫/Cj_BlueToothBarCodePrint.html                       |  424 +
 WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html                                    |   48 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Car.html                                 |  232 
 WebTM/views/系统管理/用户管理/Xt_UserListEdit.html                                   |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html                      | 1636 ++-
 WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill_XW.html               |  290 
 WebTM/views/grf/职员标签.grf                                                     |  151 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                                  |    3 
 73 files changed, 22,051 insertions(+), 2,762 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 0d818a2..7c26200 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-11-27T01:52:45.8455378Z;False|2025-11-27T09:52:27.1660968+08:00;True|2025-11-20T15:28:35.1782374+08:00;False|2025-11-20T15:27:58.2912950+08:00;True|2025-11-17T11:28:38.8503182+08:00;True|2025-11-17T11:23:56.4734268+08:00;False|2025-11-17T11:23:36.4097197+08:00;True|2025-11-13T15:25:28.7953742+08:00;True|2025-11-13T14:27:31.1949834+08:00;True|2025-11-13T14:06:59.9226754+08:00;True|2025-11-13T14:06:35.1547300+08:00;False|2025-11-13T14:06:09.0757993+08:00;True|2025-11-12T14:43:27.0202870+08:00;True|2025-11-12T14:40:27.2254016+08:00;True|2025-11-12T14:37:20.2647679+08:00;True|2025-11-12T11:26:52.2724565+08:00;True|2025-11-12T11:17:22.1910757+08:00;False|2025-11-12T11:17:09.9827931+08:00;True|2025-11-11T11:17:42.2481252+08:00;True|2025-11-11T11:15:23.2002587+08:00;True|2025-11-11T11:06:44.0655665+08:00;False|2025-11-11T11:05:59.0473577+08:00;True|2025-11-07T14:53:42.4049572+08:00;False|2025-11-07T14:53:29.7282450+08:00;True|2025-11-06T19:55:50.3986389+08:00;False|2025-11-06T19:55:37.6951063+08:00;True|2025-11-06T18:55:19.6956604+08:00;False|2025-11-06T18:54:59.4904683+08:00;True|2025-11-05T08:43:47.0030261+08:00;False|2025-11-05T08:43:29.9947483+08:00;True|2025-11-04T17:28:17.0668341+08:00;True|2025-11-04T16:57:28.8159643+08:00;True|2025-11-04T16:50:31.4445039+08:00;False|2025-11-04T16:50:02.5463432+08:00;False|2025-10-24T11:55:45.1520972+08:00;True|2025-10-22T09:36:13.3802970+08:00;False|2025-10-22T09:35:40.2114838+08:00;True|2025-10-17T10:10:32.1090093+08:00;False|2025-10-17T10:10:14.2097087+08:00;True|2025-10-17T08:57:50.4986438+08:00;False|2025-10-17T08:57:34.6148729+08:00;True|2025-10-15T17:38:42.7890693+08:00;False|2025-10-15T17:38:29.5336459+08:00;True|2025-10-15T14:44:19.9596931+08:00;False|2025-10-15T14:44:06.9733338+08:00;True|2025-10-14T15:03:55.2080252+08:00;True|2025-10-14T13:50:06.8239140+08:00;False|2025-10-14T13:49:17.5380992+08:00;True|2025-10-09T15:43:21.8621182+08:00;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>
+    <History>True|2025-12-09T04:08:11.3908592Z;False|2025-12-09T12:07:58.5164793+08:00;True|2025-12-08T09:12:51.0932352+08:00;True|2025-12-08T09:10:41.2878088+08:00;True|2025-12-08T09:06:21.1445018+08:00;True|2025-12-08T09:04:37.3464741+08:00;True|2025-12-08T09:03:22.0422524+08:00;True|2025-12-08T08:58:24.8293057+08:00;True|2025-12-08T08:48:27.4588721+08:00;True|2025-12-08T08:43:56.2631642+08:00;True|2025-12-08T08:43:12.1755462+08:00;False|2025-12-08T08:42:46.8920155+08:00;True|2025-12-05T10:44:33.9514625+08:00;True|2025-12-05T10:32:48.6399523+08:00;False|2025-12-05T10:32:31.3728861+08:00;True|2025-12-04T16:24:38.4261651+08:00;True|2025-12-04T16:17:04.1081985+08:00;True|2025-12-04T16:13:49.5694236+08:00;True|2025-12-04T16:01:16.0391216+08:00;True|2025-12-04T16:00:53.6951993+08:00;True|2025-12-04T15:58:47.1517135+08:00;True|2025-12-04T15:42:30.5816099+08:00;True|2025-12-04T15:36:28.0075855+08:00;False|2025-12-04T15:36:03.1568322+08:00;True|2025-12-03T19:58:39.4533793+08:00;True|2025-12-03T19:52:51.1409060+08:00;True|2025-12-03T19:51:42.1229811+08:00;True|2025-12-03T19:51:15.8450479+08:00;False|2025-12-03T19:50:51.2966327+08:00;False|2025-12-03T16:53:30.5213684+08:00;True|2025-12-02T12:44:40.6183861+08:00;False|2025-12-02T12:44:24.5789155+08:00;True|2025-12-02T09:26:46.2955107+08:00;True|2025-12-02T09:21:54.3264858+08:00;False|2025-12-02T09:21:34.1549180+08:00;True|2025-12-01T14:34:11.6114683+08:00;True|2025-12-01T14:28:44.9950983+08:00;True|2025-12-01T14:27:53.1434607+08:00;False|2025-12-01T14:27:32.3942829+08:00;False|2025-11-26T16:42:47.3562608+08:00;True|2025-11-25T15:06:09.2325014+08:00;False|2025-11-25T15:05:41.8496202+08:00;True|2025-11-07T14:53:42.4049572+08:00;False|2025-11-07T14:53:29.7282450+08:00;True|2025-11-06T19:55:50.3986389+08:00;False|2025-11-06T19:55:37.6951063+08:00;True|2025-11-06T18:55:19.6956604+08:00;False|2025-11-06T18:54:59.4904683+08:00;True|2025-11-05T08:43:47.0030261+08:00;False|2025-11-05T08:43:29.9947483+08:00;True|2025-11-04T17:28:17.0668341+08:00;True|2025-11-04T16:57:28.8159643+08:00;True|2025-11-04T16:50:31.4445039+08:00;False|2025-11-04T16:50:02.5463432+08:00;False|2025-10-24T11:55:45.1520972+08:00;True|2025-10-22T09:36:13.3802970+08:00;False|2025-10-22T09:35:40.2114838+08:00;True|2025-10-17T10:10:32.1090093+08:00;False|2025-10-17T10:10:14.2097087+08:00;True|2025-10-17T08:57:50.4986438+08:00;False|2025-10-17T08:57:34.6148729+08:00;True|2025-10-15T17:38:42.7890693+08:00;False|2025-10-15T17:38:29.5336459+08:00;True|2025-10-15T14:44:19.9596931+08:00;False|2025-10-15T14:44:06.9733338+08:00;True|2025-10-14T15:03:55.2080252+08:00;True|2025-10-14T13:50:06.8239140+08:00;False|2025-10-14T13:49:17.5380992+08:00;True|2025-10-09T15:43:21.8621182+08:00;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>11/20/2025 15:27:50</publishTime>
+      <publishTime>12/08/2025 09:40:16</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>11/20/2025 15:27:50</publishTime>
+      <publishTime>12/08/2025 09:40:16</publishTime>
     </File>
     <File Include="Download/WMS杞欢瀹夎鍖�.apk">
       <publishTime>07/26/2025 12:50:47</publishTime>
@@ -1120,7 +1120,7 @@
       <publishTime>05/23/2025 09:19:17</publishTime>
     </File>
     <File Include="layuiadmin/modules/tableSelect.js">
-      <publishTime>05/23/2025 09:19:17</publishTime>
+      <publishTime>12/03/2025 18:34:44</publishTime>
     </File>
     <File Include="layuiadmin/modules/transfer.js">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -1244,7 +1244,7 @@
     <File Include="layuiadmin/Scripts/webConfig.js">
       <publishTime>04/27/2021 13:44:39</publishTime>
       <publishTime>04/30/2021 08:50:34</publishTime>
-      <publishTime>11/05/2025 16:06:28</publishTime>
+      <publishTime>12/03/2025 18:37:29</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig2.js">
       <publishTime>09/26/2025 09:45:44</publishTime>
@@ -1703,6 +1703,9 @@
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/OtherOutRequestBillList.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
+    </File>
+    <File Include="views/Baseset/鍩虹璧勬枡/saomazutuo_xiaowei.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -2353,7 +2356,7 @@
       <publishTime>08/08/2025 12:48:22</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/home/console_Mobile_KaiBeiNaiTe.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -2730,7 +2733,7 @@
     <File Include="views/user/login.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>06/03/2025 15:34:31</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/user/login2.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -2905,11 +2908,17 @@
     <File Include="views/WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventoryByWorkShop_PDA.html">
       <publishTime>07/02/2025 08:43:51</publishTime>
     </File>
+    <File Include="views/WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventory_Clear_PDA.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
     <File Include="views/WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventory_WorkShopByCLD_PDA.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/搴撳瓨鏌ヨ/KF_ICInventory_WorkShopByXJ_PDA.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/搴撳瓨杞Щ/kf_InventoryTransfer.html">
+      <publishTime>10/24/2025 11:53:31</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/搴撳瓨杞Щ/kf_InventoryTransfer.html">
       <publishTime>10/24/2025 11:53:31</publishTime>
@@ -2930,7 +2939,7 @@
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鎵捐揣涓婃灦鍗�/Kf_MaterialUpperBill_PDA.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鎵捐揣涓嬫灦鍗�/Kf_MaterialLowerBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -2987,10 +2996,10 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_Packing_PDA.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_Pallet_PDA.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鐢熶骇绠＄悊/鐢熶骇缁勬墭鍗�/Sc_PackUnionBill_PDA.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -3248,7 +3257,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/鍒嗘寮忚皟鍏ュ崟/Fb_StepFoldinBillList.html">
       <publishTime>09/15/2025 18:07:21</publishTime>
@@ -3408,6 +3417,9 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Driver.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
@@ -3427,7 +3439,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MaintainLev.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html">
       <publishTime>10/24/2025 11:53:31</publishTime>
@@ -3552,6 +3564,9 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Warehouse_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Warehouse_Excel.html">
+      <publishTime>05/23/2025 09:19:18</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/b.grf">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
@@ -3610,7 +3625,7 @@
       <publishTime>06/26/2025 17:53:49</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BarCodeReport.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Billorigin.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
@@ -3663,7 +3678,7 @@
       <publishTime>07/19/2021 10:10:46</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
       <publishTime>04/29/2021 09:11:59</publishTime>
@@ -3674,6 +3689,9 @@
       <publishTime>04/29/2021 09:11:59</publishTime>
       <publishTime>04/29/2021 09:11:59</publishTime>
       <publishTime>05/24/2021 09:34:03</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DriverList.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -3717,7 +3735,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html">
-      <publishTime>05/28/2025 09:37:26</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ManualSynchronization.html">
       <publishTime>06/26/2025 17:53:49</publishTime>
@@ -3732,6 +3750,12 @@
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialCorrection2.html">
       <publishTime>05/30/2025 11:06:37</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelationList.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialPackingRelation_Edit.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3751,6 +3775,12 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MultipleCodes_Report.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OperationBill_Report.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
@@ -3765,6 +3795,9 @@
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PiPeMaterial.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PlanImplementation_Report.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PNLInfoEdit.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -3918,7 +3951,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>11/13/2025 14:16:27</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint_GXPG.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4080,7 +4113,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldFileMainBill.aspx">
-      <publishTime>07/02/2025 08:43:51</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_MouldMaintainBill.aspx">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4175,6 +4208,9 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList_Small.aspx">
       <publishTime>11/13/2025 14:26:45</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList_stock.aspx">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
@@ -4217,12 +4253,21 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlSRM_Web_BarCodeBillList.aspx">
       <publishTime>09/08/2025 11:03:50</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlzuotuo_xiaowei.aspx">
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
       <publishTime>04/30/2021 08:42:02</publishTime>
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_BilloriginEdit.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeEdit.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeList.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_COMMONCONTACTEdit.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4231,10 +4276,10 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonEdit.html">
-      <publishTime>06/09/2025 12:01:41</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4246,28 +4291,28 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClass_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html">
-      <publishTime>06/09/2025 12:01:41</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethod_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">
-      <publishTime>05/28/2025 09:37:26</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheck_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4279,22 +4324,22 @@
       <publishTime>06/09/2025 12:01:41</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClass.html">
-      <publishTime>07/16/2025 09:57:42</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClassEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClass.html">
-      <publishTime>07/16/2025 09:57:42</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClassEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">
-      <publishTime>07/16/2025 10:09:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Maintain_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4390,22 +4435,22 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClass.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClassEdit.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClass.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClassEdit.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList_PDA.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4414,22 +4459,22 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClass.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClassEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClass.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClassEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">
-      <publishTime>05/23/2025 09:19:18</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Repair_Excel.html">
       <publishTime>11/17/2025 17:40:33</publishTime>
@@ -5029,7 +5074,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/Xs_SellOutCompareToProductReport.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/Xs_SellOutMoneyRangeReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5053,13 +5098,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鏉＄爜鏄庣粏/Kf_BarCodeDetailQuery.html">
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/鏉＄爜鏄庣粏/Kf_MateOutBillList_CodeDetail.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妗堜緥浠ｇ爜/鍗庤繙/HY_HistogramReport.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/妗堜緥浠ｇ爜/鍗庤繙/HY_HistogramReport_ForPCSCheckNote.html">
       <publishTime>07/16/2025 19:34:56</publishTime>
@@ -5099,6 +5144,12 @@
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldUpperBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鍏ュ簱鐢宠鍗�/Sc_MouldInRequestBillEdit.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鍏ュ簱鐢宠鍗�/Sc_MouldInRequestBillList.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5159,6 +5210,18 @@
     </File>
     <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿缁翠慨娲惧伐鍗�/Sc_MouldRepairSendWorkBillList.html">
       <publishTime>06/09/2025 12:01:41</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿璋冩嫧鐢宠鍗�/Sc_MouldMoveStockRequestBillEdit.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿璋冩嫧鐢宠鍗�/Sc_MouldMoveStockRequestBillList.html">
+      <publishTime>12/03/2025 17:18:13</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿棰嗙敤鐢宠鍗�/Sc_MouldOutRequestBillEdit.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/鍣ㄥ叿棰嗙敤鐢宠鍗�/Sc_MouldOutRequestBillList.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5337,8 +5400,11 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html">
+      <publishTime>12/03/2025 17:18:13</publishTime>
+    </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
-      <publishTime>05/28/2025 09:37:26</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
       <publishTime>06/13/2025 14:06:40</publishTime>
@@ -5349,14 +5415,20 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
       <publishTime>05/28/2025 09:37:26</publishTime>
     </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html">
+      <publishTime>12/03/2025 17:18:13</publishTime>
+    </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
-      <publishTime>05/28/2025 09:37:26</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit_old.html">
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
-      <publishTime>05/28/2025 09:37:26</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5415,13 +5487,19 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA_OLD.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Add_Edit_GyQCVerificationBill.html">
+      <publishTime>12/03/2025 22:36:33</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Add_Edit_Gy_QCVerificationBill.html">
+      <publishTime>12/08/2025 10:14:18</publishTime>
+    </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/BatchGen_MouldFile.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
       <publishTime>04/14/2021 09:01:36</publishTime>
       <publishTime>04/14/2021 09:01:36</publishTime>
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList_JiaNan.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -5444,7 +5522,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MaterialMouldBillMainList.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>12/08/2025 15:21:28</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -5452,10 +5530,10 @@
       <publishTime>07/19/2021 10:10:46</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
-      <publishTime>10/13/2025 13:29:46</publishTime>
+      <publishTime>12/09/2025 12:16:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
-      <publishTime>06/26/2025 17:53:49</publishTime>
+      <publishTime>12/08/2025 14:08:20</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5466,19 +5544,25 @@
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">
       <publishTime>07/19/2021 10:10:46</publishTime>
     </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_QCVerificationBillMain.html">
+      <publishTime>12/03/2025 22:38:20</publishTime>
+    </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_SplitBarCode.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBill.html">
-      <publishTime>09/15/2025 18:07:21</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/KF_BarCodeStatusChangeBillList.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
       <publishTime>04/16/2021 08:45:47</publishTime>
       <publishTime>04/16/2021 08:45:47</publishTime>
       <publishTime>05/23/2025 09:19:19</publishTime>
+    </File>
+    <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_Gy_QCVerificationBillList.html">
+      <publishTime>12/03/2025 19:58:25</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
       <publishTime>06/13/2025 14:06:40</publishTime>
@@ -5756,7 +5840,7 @@
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鍒堕�犲懆鏈熸姤琛�/Sc_ProductionCycleBillList.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6062,7 +6146,7 @@
       <publishTime>09/05/2025 16:05:26</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisReport.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>12/01/2025 20:31:22</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisReport_His.html">
       <publishTime>09/05/2025 16:05:26</publishTime>
@@ -6086,7 +6170,7 @@
       <publishTime>07/16/2025 19:34:56</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/娣诲悍涓夊懆鎺掍骇/JIT_DayPlanPlatForm_TK2.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/娣诲悍涓夊懆鎺掍骇/JIT_LiftMaterPlaBillnList_TK.html">
       <publishTime>07/16/2025 19:34:56</publishTime>
@@ -6160,7 +6244,7 @@
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>11/20/2025 15:27:47</publishTime>
+      <publishTime>12/02/2025 09:47:09</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList_LookDown.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6278,7 +6362,7 @@
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>11/25/2025 15:01:36</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6305,7 +6389,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
-      <publishTime>07/10/2025 17:32:52</publishTime>
+      <publishTime>12/02/2025 09:21:25</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
       <publishTime>11/06/2025 18:54:53</publishTime>
@@ -6398,7 +6482,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>12/01/2025 18:36:52</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterialDetailList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6570,7 +6654,7 @@
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserListEdit.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>12/03/2025 18:34:44</publishTime>
     </File>
     <File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserRightQuery.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6648,7 +6732,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>11/20/2025 15:23:58</publishTime>
+      <publishTime>12/01/2025 17:31:28</publishTime>
     </File>
     <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCheckQuery.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6663,7 +6747,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillimport_WorkQty.html">
-      <publishTime>04/18/2025 12:56:47</publishTime>
+      <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -6687,7 +6771,7 @@
     <File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
       <publishTime>04/12/2021 11:31:26</publishTime>
-      <publishTime>11/20/2025 15:27:47</publishTime>
+      <publishTime>12/02/2025 09:47:09</publishTime>
     </File>
     <File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -7079,10 +7163,10 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill_v2.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7127,13 +7211,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill_XW.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html">
-      <publishTime>11/11/2025 11:17:33</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
       <publishTime>11/11/2025 10:59:55</publishTime>
@@ -7160,7 +7244,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7220,7 +7304,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/03/2025 17:18:13</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7256,10 +7340,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
-      <publishTime>11/05/2025 16:02:58</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html">
       <publishTime>06/24/2025 11:23:16</publishTime>
@@ -7323,6 +7407,9 @@
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_InspectionFormReport.html">
       <publishTime>06/25/2025 14:21:31</publishTime>
+    </File>
+    <File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_MeasuringToolsyWarningReport.html">
+      <publishTime>12/09/2025 12:40:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_MoistureContentDataLedger.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7406,7 +7493,7 @@
       <publishTime>07/22/2021 08:55:24</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>12/05/2025 09:11:52</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7456,7 +7543,7 @@
       <publishTime>09/23/2025 10:36:50</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/浜х嚎/MES_ProductionLinePackaging_MXG.html">
-      <publishTime>10/07/2025 23:04:24</publishTime>
+      <publishTime>12/02/2025 13:34:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/浜х嚎/MES_WhiteLabelGeneration.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7528,28 +7615,37 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batch.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batchKeyElement.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>12/03/2025 18:34:44</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkPackage.html">
+      <publishTime>12/03/2025 18:34:44</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkPackage_Sec.html">
+      <publishTime>12/03/2025 18:34:44</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_checkSN.html">
       <publishTime>11/11/2025 10:59:55</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_generateCaseCode.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_generateSNCode.html">
       <publishTime>11/11/2025 10:59:55</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_KeyElement.html">
-      <publishTime>11/11/2025 10:59:55</publishTime>
+      <publishTime>12/03/2025 18:34:44</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_KeyElement_Sec.html">
+      <publishTime>12/03/2025 18:34:44</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_UnbindEdit.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_UnbindList.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7810,9 +7906,6 @@
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_BatchSplit.html">
       <publishTime>10/15/2025 15:05:38</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>
     </File>
@@ -7823,7 +7916,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_dh.html">
-      <publishTime>11/20/2025 15:21:41</publishTime>
+      <publishTime>11/25/2025 08:47:16</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_Exchange.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7986,16 +8079,19 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_WorkShopICStockBillList.html">
-      <publishTime>10/24/2025 11:53:31</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_WorkShopICStockBillList.html">
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_OrderProcFlowAllReport.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>11/25/2025 15:02:35</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>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Mes_WIPProcReport.html">
       <publishTime>05/23/2025 09:19:20</publishTime>
@@ -8012,7 +8108,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_AllowedPrintProcExchangeBillList.html">
-      <publishTime>08/07/2025 13:26:41</publishTime>
+      <publishTime>12/02/2025 10:22:29</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Sc_BadReasonReport.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -8905,7 +9001,7 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
-      <publishTime>09/11/2025 10:19:52</publishTime>
+      <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
       <publishTime>04/12/2021 11:31:26</publishTime>
@@ -8982,7 +9078,7 @@
     </File>
     <File Include="Web.config">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>11/20/2025 15:28:05</publishTime>
+      <publishTime>12/08/2025 09:40:23</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/Vlog/webapi20251204.txt b/WebTM/Vlog/webapi20251204.txt
new file mode 100644
index 0000000..deb8090
--- /dev/null
+++ b/WebTM/Vlog/webapi20251204.txt
@@ -0,0 +1,35 @@
+2025/12/4 9:49:39 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222439)
+
+2025/12/4 9:49:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 9:49:42 ReportDataSet:1
+
+2025/12/4 11:01:51 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:01:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:01:51 ReportDataSet:1
+
+2025/12/4 11:30:23 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 11:30:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:23 ReportDataSet:1
+
+2025/12/4 11:30:34 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(102119)
+
+2025/12/4 11:30:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 11:30:34 ReportDataSet:1
+
+2025/12/4 14:59:33 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 14:59:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 14:59:33 ReportDataSet:1
+
+2025/12/4 15:00:26 鎵撳嵃sql:select * from h_v_IF_EmployeeList where HItemID in(222435)
+
+2025/12/4 15:00:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2025/12/4 15:00:26 ReportDataSet:1
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index a52036e..1ee760e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -192,6 +192,10 @@
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestItem.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ErrMsgBackType.html" />
     <Content Include="views\Baseset\鍩虹璧勬枡\Gy_EnvironmentTestSchemeBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Driver.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ItemMoney.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DriverList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillEdit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OperationBill_Report.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MultipleCodes_Report.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PlanImplementation_Report.html" />
@@ -466,6 +470,9 @@
     <Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\Crm_CustomerAppealBillList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelationList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialPackingRelation_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ItemMoney.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Cg_ContractTransportBillList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HGy_BarCodeBill_XinDa.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CheckNoteItem.html" />
@@ -679,6 +686,8 @@
     <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldLifeChangeBillList_PDA.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdBackBillEdit.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdMoveBillEdit.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdOutBillEdit_old.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA_OLD.html" />
@@ -686,6 +695,8 @@
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList_XinDa.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_BarCodeBillList_JiaNan.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_QCVerificationBillMain.html" />
+    <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Add_Edit_Gy_QCVerificationBill.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
     <Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm_Sec.html" />
@@ -855,6 +866,7 @@
     <Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList_ICMO.html" />
+    <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MeasuringToolsyWarningReport.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
     <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
@@ -927,15 +939,20 @@
     <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBindingList.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SaveSNByICMO.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateSNCode.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkSN.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_generateCaseCode.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkPackage.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_checkPackage_Sec.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement_Sec.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindEdit.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_UnbindList.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_KeyElement.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batchKeyElement.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_ProcessItemStationPlatform_batch.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_BlueToothBarCodePrint.html" />
+    <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯_灏忓崼\Cj_SachetBarCodePrint.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill_Excel.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
     <Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
@@ -2676,6 +2693,10 @@
     <Compile Include="App_Data\MssqlReportData.cs" />
     <Compile Include="App_Data\ReportData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs">
+      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_stock.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlzuotuo_xiaowei.aspx.cs">
       <DependentUpon>xmlzuotuo_xiaowei.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index ed38634..17a8236 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,41 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-TM\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
-    <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
-    <UseIISExpress>true</UseIISExpress>
-    <Use64BitIISExpress />
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
   </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 12a7fd9..68e6c4f 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,15 +5,19 @@
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
     /*var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
-    // var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆
+   /*  var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆*/
     //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+<<<<<<< HEAD
     var WEBURL = "http://localhost:8080/API/";    //鐜嬩华鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+=======
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+>>>>>>> cf4a059eee9a05b9b181e9970167f9726379c004
     //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:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
+    // var WEBURL = "http://localhost:8082/LuBaoAPI/";  //鏉庢灄淇婃湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
     //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //濂ラ偊
     //var WEBURL = "http://10.1.4.155/API/";            //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/layuiadmin/modules/tableSelect.js b/WebTM/layuiadmin/modules/tableSelect.js
index 6d7fa06..1857322 100644
--- a/WebTM/layuiadmin/modules/tableSelect.js
+++ b/WebTM/layuiadmin/modules/tableSelect.js
@@ -13,6 +13,78 @@
         this.v = '1.4.0';
     };
 
+    //鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗嗕娇鐢ㄦ渚�
+    //tableSelect.render({
+    //    elem: '#HMATERIALNAME',
+    //    checkedKey: 'HItemID',
+    //    searchKey: '鐗╂枡浠ｇ爜,鐗╂枡鍚嶇О',
+    //    sWhere: '',//table鎼滅储sWhere鏉′欢
+    //    table: {
+    //        url: GetWEBURL() + 'Gy_Material/page',
+    //        where: { user: sessionStorage["HMaker"], "Organization": sessionStorage["Organization"] },
+    //        cols: [[
+    //            { type: 'checkbox', fixed: 'left' },
+    //            { field: 'HItemID', title: 'HItemID' },
+    //            { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' },
+    //            { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' },
+    //        ]],
+    //        page: true,
+    //        limit: 5,
+    //        limits: [5]
+    //    },
+    //    done: function (elem, data) {
+    //        if (data != []) {
+    //            //鑾峰彇鏁版嵁
+    //            /*$("#HMATERIALNAME").blur();//鍗曞厓鏍煎け鍘荤劍鐐�*/
+    //            $("#HMATERIALID").val(data.data[0].HItemID);
+    //            $("#HMATERIALNAME").val(data.data[0].鐗╂枡鍚嶇О);
+    //            get_FastQuery()
+    //        }
+
+    //    }
+    //})
+    //宸ュ簭琛ㄦ牸涓嬫媺鎼滅储妗�
+    //tableSelect.render({
+    //    elem: 'td[data-field="宸ュ簭"] .layui-table-edit',
+    //    searchKey: '宸ュ簭浠ｇ爜,宸ュ簭鍚嶇О',
+    //    sWhere: " and 鏄庣粏鏍囪 = 'Y' and 绂佺敤鏍囪 != 'Y'",//table鎼滅储sWhere鏉′欢
+    //    ajaxSelect: function (sWhere) {
+    //        var data = '';
+    //        $.ajax({
+    //            url: GetWEBURL() + '/Gy_Process/list',
+    //            type: "GET",
+    //            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+    //            async: false,
+    //            success: function (data1) {
+    //                if (data1.count == 1) {
+    //                    data = data1.data
+    //                }
+    //            },
+    //            error: function () {
+    //                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+    //            }
+    //        });
+    //        return data;
+    //    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+    //    table: {
+    //        cols: [[
+    //            { type: 'radio', fixed: 'left' },
+    //            { field: 'HItemID', title: 'HItemID', hide: true },
+    //            { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' },
+    //            { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' },
+    //            { field: 'HProcMulID', title: 'HProcMulID', hide: true },
+    //            { field: '宸ユ鍚嶇О', title: '宸ユ鍚嶇О' }
+    //        ]],
+    //        page: true,
+    //        limit: 5,
+    //        //limits: [5]
+    //    },
+    //    done: function (elem, data) {
+    //        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+    //        //setTableByHMater(obj, data);
+    //    }
+    //})
+
     /**
     * 鍒濆鍖栬〃鏍奸�夋嫨鍣�
     */
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
index e3394f9..eb3a918 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/saomazutuo_xiaowei.html"
@@ -470,69 +470,84 @@
                     layer.msg('鏉＄爜涓嶈兘涓虹┖锛岃鎵弿鏉＄爜锛�', { icon: 2 });
                     return;
                 }
-
-                $.ajax({
-                    url: GetWEBURL() + '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
-                    type: 'GET',
-                    data: {
-                        "HInterID": hform.HInterID,
-                        "HBarCode": sBarCode,
-                        "HBillType": HBillType,
-                        "HBillSubType": HBillSubType,
-                        "HBarCode_Pack": '',
-                        "HBillNo": hform.HBillNo,
-                        "HMaterNumber_Pack": HMaterNumber_Pack,
-                        "HMaker": hform.HMaker,
-                        "HStockOrgID": hform.HStockOrgID
-                    },
-                    success: function (res) {
-                        FindMaterial();
-                        if (res.count == 1) {
-                            layer.msg('鏉＄爜澶勭悊鎴愬姛', { icon: 1 });
-                            listData.push({
-                                鏉＄爜缂栧彿: sBarCode,
-                                鏁伴噺: 1,
-                                鐗╂枡浠ｇ爜: hform.HMaterID,
-                                鐗╂枡鍚嶇О: hform.HMaterName,
-                                鏉＄爜涓暟: 1,
-                                HInterID: hform.HInterID
-                            });
-
-                            table.reload('mainTable', {
-                                data: listData
-                            });
-
-                            $('#HBarCode').val('');
-                        } else {
-                            layer.msg(res.Message || '鏉＄爜澶勭悊澶辫触', { icon: 2 });
-                        }
-                    },
-                    error: function () {
-                        layer.msg('鏉＄爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+                FindMaterial(sBarCode).then(function (materialInfo) {
+                    if (!materialInfo) {
+                        layer.msg('鏈壘鍒扮墿鏂欎俊鎭�', { icon: 2 });
+                        return;
                     }
+                    hform.HMaterID = materialInfo.HMaterID;
+                    hform.HMaterName = materialInfo.HMaterName;
+                    hform.HMaterModel = materialInfo.HMaterModel;
+                    $.ajax({
+                        url: GetWEBURL() + '/WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei',
+                        type: 'GET',
+                        data: {
+                            "HInterID": hform.HInterID,
+                            "HBarCode": sBarCode,
+                            "HBillType": HBillType,
+                            "HBillSubType": HBillSubType,
+                            "HBarCode_Pack": '',
+                            "HBillNo": hform.HBillNo,
+                            "HMaterNumber_Pack": HMaterNumber_Pack,
+                            "HMaker": hform.HMaker,
+                            "HStockOrgID": hform.HStockOrgID
+                        },
+                        success: function (res) {
+                            if (res.count == 1) {
+                                layer.msg('鏉＄爜澶勭悊鎴愬姛', { icon: 1 });
+                                listData.push({
+                                    鏉＄爜缂栧彿: sBarCode,
+                                    鏁伴噺: 1,
+                                    鐗╂枡浠ｇ爜: hform.HMaterID,
+                                    鐗╂枡鍚嶇О: hform.HMaterName,
+                                    鏉＄爜涓暟: 1,
+                                    HInterID: hform.HInterID
+                                });
+
+                                table.reload('mainTable', {
+                                    data: listData
+                                });
+
+                                $('#HBarCode').val('');
+                            } else {
+                                layer.msg(res.Message || '鏉＄爜澶勭悊澶辫触', { icon: 2 });
+                            }
+                        },
+                        error: function () {
+                            layer.msg('鏉＄爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
+                        }
+                    });
+                }).catch(function (error) {
+                    layer.msg('鏌ユ壘鐗╂枡澶辫触: ' + error, { icon: 2 });
                 });
             }
 
-            function FindMaterial() {
-                var sBarCode = $('#HBarCode').val();
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_Material/findMaterialByNumber',
-                    type: 'GET',
-                    data: {
-                        "HbarCode": sBarCode,
-                        "HSTOCKORGID": hform.HStockOrgID
-                    },
-                    success: function (res) {
-                        let data = res.data;
-                        if (res.count == 1) {
-                            hform.HMaterID = data[0].HMaterID
-                            hform.HMaterName = data[0].HMaterName
-                            hform.HMaterModel = data[0].HMaterModel
+
+            function FindMaterial(sBarCode) {
+                return new Promise(function (resolve, reject) {
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_Material/findMaterialByNumber',
+                        type: 'GET',
+                        data: {
+                            "HbarCode": sBarCode,
+                            "HSTOCKORGID": hform.HStockOrgID
+                        },
+                        success: function (res) {
+                            let data = res.data;
+                            if (res.count == 1) {
+                                resolve({
+                                    HMaterID: data[0].HMaterID,
+                                    HMaterName: data[0].HMaterName,
+                                    HMaterModel: data[0].HMaterModel
+                                });
+                            } else {
+                                resolve(null); 
+                            }
+                        },
+                        error: function () {
+                            reject('鏌ユ壘鐗╂枡澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
                         }
-                    },
-                    error: function () {
-                        layer.msg('鏉＄爜澶勭悊澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�', { icon: 2 });
-                    }
+                    });
                 });
             }
 
diff --git "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
index af29893..ad57105 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\346\211\276\350\264\247\344\270\212\346\236\266\345\215\225/Kf_MaterialUpperBill_PDA.html"
@@ -103,7 +103,7 @@
                                             </div>
                                             <div class="layui-col-xs9">
                                                 <div class="layui-col-xs10">
-                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
+                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" readonly>
                                                 </div>
                                                 <!--<div class="layui-col-xs2" style="float: right;">
                                                     <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
@@ -342,7 +342,7 @@
                 table.render(LowerListOption);
 
                 //鍏夋爣榛樿鍦ㄦ潯鐮佷綅缃笂
-                var pFocus = $("#HSourceBillNo");
+                var pFocus = $("#HBarCode");
                 pFocus.select();
                 pFocus.focus();     //鑾峰彇鍏夋爣
             }
@@ -929,7 +929,11 @@
                         success: function (result) {
                             if (result.count == 1) {
                                 playSound_OK();
-
+                                if (sBarCode.startsWith("GXLX")) {
+                                    $("#HMainSourceBillNo").val(sBarCode);
+                                    $("#HSourceBillNo").val(sBarCode);
+                                }
+                                
                                 if (HSourceFlag != true) {
                                     HSourceFlag = 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\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html" "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
index f918d71..f5b5561 100644
--- "a/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
+++ "b/WebTM/views/WMS\346\211\253\347\240\201\346\250\241\345\235\227/\347\224\237\344\272\247\350\260\203\346\213\250/Kf_MoveStockBill_PDA_XiaBao.html"
@@ -1821,6 +1821,8 @@
             function GetMeesageBySourceBillNo(obj) {
                 var HSourceBillNo = $('#HSourceBillNo').val()
                 var HSourceBillType = $("#HMainSourceBillType").val()
+                var sHWHID = $("#HWHID").val()
+                var sHSCWHID = $("#HSCWHID").val()
                 layer.load(3)
                 $.ajax({
                     type: "GET",
diff --git "a/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..df40817
--- /dev/null
+++ "b/WebTM/views/grf/\350\201\214\345\221\230\346\240\207\347\255\276.grf"
@@ -0,0 +1,151 @@
+锘縊bject Report
+	Version='6.8.2.2'
+	Title='浣犵殑鎶ヨ〃鏍囬'
+	PrintAsDesignPaper=F
+	Object Font
+		Name='瀹嬩綋'
+		Size=105000,0
+		Weight=400
+		Charset=134
+	End
+	Object Printer
+		Size=256
+		Width=9.7
+		Height=6
+		LeftMargin=0.1
+		TopMargin=0
+		RightMargin=0.1
+		BottomMargin=0
+	End
+	Object DetailGrid
+		CenterView=T
+		Object Border
+			Object Pen
+				Width=1.5
+			End
+		End
+		Object Recordset
+			Items Field
+				Item
+					Name='鑱屽憳鍚嶇О'
+				End
+				Item
+					Name='鑱屽憳浠ｇ爜'
+				End
+					End
+	End
+	Items Column
+		Item
+			Name='鏍囩瀹藉害'
+			Width=9.7
+			FixedWidth=T
+		End
+	End
+Object ColumnContent
+	Height=5.3975
+	Items ColumnContentCell
+		Item
+			Column='鏍囩瀹藉害'
+			FreeCell=T
+			Items Control
+				Item
+					Type=FreeGrid
+					Name='FreeGrid1'
+					Left=0.396875
+					Top=0.211667
+					Object Border
+						Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
+					End
+					ColumnCount=2
+					RowCount=2
+					Items FreeGridColumn
+						Item[1]
+							Width=3.99521
+							FixedWidth=T
+						End
+						Item[2]
+							Width=4.6
+							FixedWidth=T
+						End
+									End
+				Items FreeGridRow
+					Item[1]
+						Height=2.5
+					End
+					Item[2]
+						Height=2.5
+					End
+							End
+			Items FreeGridCell
+				Item[1,1]
+					Object Font
+						Name='瀹嬩綋'
+						Size=142500,0
+						Bold=T
+						Charset=134
+					End
+					TextAlign=MiddleCenter
+					Text='[#鑱屽憳浠ｇ爜#]'
+				End
+				Item[1,2]
+					FreeCell=T
+					Items Control
+						Item
+							Type=Barcode
+							Name='Barcode1'
+							Left=0.211667
+							Top=0.211667
+							Width=4.18042
+							Height=4.78896
+							BarcodeType=QRCode
+							CaptionPosition=None
+							Text='[#鏉＄爜缂栧彿#]'
+						End
+									End
+				RowSpan=2
+			End
+			Item[2,1]
+				Object Font
+					Name='瀹嬩綋'
+					Size=142500,0
+					Bold=T
+					Charset=134
+				End
+				TextAlign=MiddleCenter
+				Text='[#鑱屽憳鍚嶇О#]'
+			End
+			End
+End
+End
+End
+End
+End
+Object ColumnTitle
+	Height=0
+	Items ColumnTitleCell
+		Item
+			GroupTitle=F
+			Column='鏍囩瀹藉害'
+			TextAlign=MiddleCenter
+			PaddingLeft=0
+			PaddingRight=0
+			PaddingTop=0
+			PaddingBottom=0
+		End
+	End
+End
+End
+Items ReportHeader
+	Item
+		Name='ReportHeader1'
+		Height=0.211667
+		RepeatOnPage=T
+	End
+End
+Items ReportFooter
+	Item
+		Name='ReportFooter1'
+		Height=0
+	End
+End
+End
diff --git "a/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf" "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
new file mode 100644
index 0000000..b0aad17
--- /dev/null
+++ "b/WebTM/views/grf/\350\223\235\347\211\231\346\235\241\347\240\201\346\240\207\347\255\276_\345\260\217\345\215\253.grf"
@@ -0,0 +1,87 @@
+锘縶
+	"Version":"6.8.2.2",
+	"Title":"鐢熶骇浠诲姟鍗�",
+	"PrintAsDesignPaper":false,
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":135000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":4.7,
+		"Height":2.8,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"ShowColLine":false,
+		"ShowRowLine":false,
+		"Border":{
+			"Styles":"[]"
+		},
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鏉＄爜缂栧彿"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column3",
+				"Width":4.7
+			}
+		],
+		"ColumnContent":{
+			"Height":2.8,
+			"RowsPerPage":1,
+			"ColumnContentCell":[
+				{
+					"Column":"Column3",
+					"FreeCell":true,
+					"CanGrow":true,
+					"Control":[
+						{
+							"Type":"Barcode",
+							"Name":"Barcode1",
+							"Left":0.211667,
+							"Top":0.396875,
+							"Width":4.18042,
+							"Height":1.79917,
+							"BarcodeType":"Code128Auto",
+							"Text":"[#鏉＄爜缂栧彿#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column3",
+					"Text":"Column1"
+				}
+			]
+		}
+	},
+	"ReportHeader":[
+		{
+			"Name":"ReportHeader1",
+			"Height":0,
+			"RepeatOnPage":true
+		}
+	],
+	"ReportFooter":[
+		{
+			"Name":"ReportFooter1",
+			"Height":0
+		}
+	]
+}
\ No newline at end of file
diff --git "a/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf" "b/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf"
new file mode 100644
index 0000000..4676ca3
--- /dev/null
+++ "b/WebTM/views/grf/\351\246\231\345\233\212\346\250\241\346\235\277JSON.grf"
@@ -0,0 +1,87 @@
+锘縶
+	"Version":"6.8.2.5",
+	"Font":{
+		"Name":"瀹嬩綋",
+		"Size":105000,
+		"Weight":400,
+		"Charset":134
+	},
+	"Printer":{
+		"Size":256,
+		"Width":4.7,
+		"Height":2.8,
+		"LeftMargin":0,
+		"TopMargin":0,
+		"RightMargin":0,
+		"BottomMargin":0
+	},
+	"DetailGrid":{
+		"CenterView":true,
+		"Recordset":{
+			"Field":[
+				{
+					"Name":"鏂欏彿"
+				},
+				{
+					"Name":"鐗╂枡浠ｇ爜"
+				},
+				{
+					"Name":"鐗╂枡鍚嶇О"
+				},
+				{
+					"Name":"鎵瑰彿"
+				},
+				{
+					"Name":"鏁伴噺"
+				},
+				{
+					"Name":"渚涘簲鍟�"
+				},
+				{
+					"Name":"婧愬崟鍙�"
+				},
+				{
+					"Name":"鏉＄爜缂栧彿"
+				}
+			]
+		},
+		"Column":[
+			{
+				"Name":"Column1",
+				"Width":4.70958
+			}
+		],
+		"ColumnContent":{
+			"Height":2.59292,
+			"ColumnContentCell":[
+				{
+					"Column":"Column1",
+					"FreeCell":true,
+					"Control":[
+						{
+							"Type":"Barcode",
+							"Name":"Barcode1",
+							"Left":0.608542,
+							"Top":0.79375,
+							"Width":3.20146,
+							"Height":1.00542,
+							"BarcodeType":"Code128Auto",
+							"Text":"[#鏉＄爜缂栧彿#]"
+						}
+					]
+				}
+			]
+		},
+		"ColumnTitle":{
+			"Height":0,
+			"ColumnTitleCell":[
+				{
+					"GroupTitle":false,
+					"Column":"Column1",
+					"TextAlign":"MiddleCenter",
+					"Text":"Column1"
+				}
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index c51ad35..e324913 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -392,7 +392,7 @@
 
             //鐧诲綍
             function loging() {
-                if ($("#Organization").val() == 0) {
+                if ($("#Organization").val() == 0 || $("#Organization").val() == "" || $("#Organization").val() == null || $("#Organization").val() == undefined) {
                     //playSound();
                     layer.msg(get_MessageError("[0000-1-071]璇烽�夋嫨缁勭粐锛�", $("#HTranSlate").val()));
                     return;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
index 8693fda..83b2567 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/Add_Edit_Gy_Car.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
@@ -114,8 +114,18 @@
                                             <label class="layui-form-label">杞﹁締琛岄┒璇佺収鐗�</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" id="HCarCardIDPic"
-                                                    name="HCarCardIDPic">
+                                                    style="color: blue;cursor: default;" name="HCarCardIDPic" readonly>
                                             </div>
+                                            <button type="button" lay-submit="" class="layui-btn"
+                                                id="HCarCardIDPic-BT-ChooseFile"
+                                                lay-filter="HCarCardIDPic-BT-ChooseFile" style="width:6rem;">
+                                                閫夋嫨鏂囦欢
+                                            </button>
+                                            <button type="button" lay-submit="" class="layui-btn"
+                                                id="HCarCardIDPic_BT_UploadFile"
+                                                lay-filter="HCarCardIDPic_BT_UploadFile" style="width:6rem;">
+                                                涓婁紶鏂囦欢
+                                            </button>
                                         </div>
                                         <div class="layui-inline layui-col-xs4">
                                             <label class="layui-form-label">杞﹁締骞存鏃ユ湡</label>
@@ -131,7 +141,7 @@
                                             <label class="layui-form-label">杞﹁締鐓х墖</label>
                                             <div class="layui-input-inline">
                                                 <input type="text" class="layui-input" id="HCarPric" name="HCarPric"
-                                                    readonly>
+                                                    style="color: blue;cursor: default;" readonly>
                                             </div>
                                             <button type="button" lay-submit="" class="layui-btn"
                                                 id="HCarPric-BT-ChooseFile" lay-filter="HCarPric-BT-ChooseFile"
@@ -139,7 +149,7 @@
                                                 閫夋嫨鏂囦欢
                                             </button>
                                             <button type="button" lay-submit="" class="layui-btn"
-                                                id="HCarPric-BT-UploadFile" lay-filter="HCarPric-BT-UploadFile"
+                                                id="HCarPric_BT_UploadFile" lay-filter="HCarPric_BT_UploadFile"
                                                 style="width:6rem;">
                                                 涓婁紶鏂囦欢
                                             </button>
@@ -470,7 +480,10 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
+                        
                         debugger
+                        $("#HCarTypeName").val(checkStatus.data[0]['杞﹀瀷鍚嶇О'])
+                        $("#HCarTypeID").val(checkStatus.data[0]['HItemID'])
 
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                     }
@@ -487,6 +500,117 @@
                 set_CheckBill(data);
             });
 
+            // 杞﹁締琛岄┒璇佺収鐗囦笂浼�
+            form.on('submit(HCarCardIDPic_BT_UploadFile)', function (data) {
+                // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀～鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                if (!$("#HNumber").val()) {
+                    layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                    return false
+                }
+                if (!(uploadFiles.HCarCardIDPic)) {
+                    layer.alert("杞﹁締琛岄┒璇佹枃浠朵负绌猴紝鏃犳硶涓婁紶!", { icon: 5 });
+                    return false
+                }
+
+                var ajaxLoad = layer.load();
+
+                var formData = new FormData();
+                formData.append("file", uploadFiles.HCarCardIDPic, uploadFiles.HCarCardIDPic.name);
+                formData.append("HNumber", $("#HNumber").val());
+                formData.append("HPrefix", "/HCarCardIDPic");
+                formData.append("HUserName", sessionStorage['HUserName']);
+
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    },
+                    compelete: function () {
+                        layer.close(ajaxLoad)
+                    }
+                },
+                )
+
+            })
+
+            // 杞﹁締鐓х墖涓婁紶
+            form.on('submit(HCarPric_BT_UploadFile)', function (data) {
+                // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀～鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                if (!$("#HNumber").val()) {
+                    layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                    return false
+                }
+                if (!(uploadFiles.HCarPric)) {
+                    layer.alert("杞︾墝鐓х墖鏂囦欢涓虹┖锛屾棤娉曚笂浼�!", { icon: 5 });
+                    return false
+                }
+
+                var formData = new FormData();
+                formData.append("file", uploadFiles.HCarPric, uploadFiles.HCarPric.name);
+                formData.append("HNumber", $("#HNumber").val());
+                formData.append("HPrefix", "/HCarPric");
+                formData.append("HUserName", sessionStorage['HUserName']);
+
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    dataType: 'json',
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    },
+                    compelete: function () {
+                        layer.close(ajaxLoad)
+                    }
+                },
+                )
+            })
+
+
+            //#region 灞曠ず鍥剧墖棰勮 閫氳繃layui鑷畾涔変簨浠�
+            layui.onevent('showImageReview', 'click(showImageReview)', function (data) {
+                layer.photos({
+                    photos: {
+                        "title": data.name,
+                        "start": 0,
+                        "data": [
+                            {
+                                "alt": data.name,
+                                "pid": 1,
+                                "src": data.src,
+                            },
+                        ]
+                    }
+                });
+            });
+            //#endregion 
 
             //#endregion
 
@@ -546,7 +670,7 @@
                     url: '', // 涓婁紶鎺ュ彛
                     auto: false,
                     // multiple: true,
-                    bindAction: '#HCarPric-BT-UploadFile',
+                    // bindAction: '#HCarPric-BT-UploadFile',
                     autoPreview: false,
                     choose: function (obj) {
                         // 閫夋嫨鏂囦欢鍚庯紝灏嗘枃浠惰В鏋愪负base64鍥剧墖鏍煎紡锛岄�氳繃瓒呴摼鎺ユ枃鏈瑙堝浘鐗�
@@ -554,7 +678,69 @@
                             console.log(index); // 寰楀埌鏂囦欢绱㈠紩
                             console.log(file); // 寰楀埌鏂囦欢瀵硅薄
                             console.log(result); // 寰楀埌鏂囦欢base64缂栫爜锛屾瘮濡傚浘鐗�
+
+                            // 灏嗘枃浠朵繚瀛樺埌鏈湴缂撳瓨锛岀瓑寰呬笂浼�
+                            uploadFiles.HCarPric = file
+                            // base64鏍煎紡鍥剧墖浣滀负棰勮椤硅緭鍑哄埌杈撳叆妗嗕腑
+                            $("#HCarPric").val(file.name)
+                            $("#HCarPric").css("cursor", "pointer")
+                            $("#HCarPric").closest("div").click(function () {
+                                console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                layui.event('showImageReview', 'click(showImageReview)', {
+                                    name: file.name,
+                                    src: result,
+                                });
+                            })
+
                         })
+                    },
+                    before: function (obj) {
+                        // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀～鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                        if (!$("#HNumber").val()) {
+                            layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                            return false
+                        }
+                    },
+                    done: function (res) {
+                        layer.msg('涓婁紶鎴愬姛');
+                        console.log(res)
+                    }
+                });
+                upload.render({
+                    elem: '#HCarCardIDPic-BT-ChooseFile',
+                    url: '', // 涓婁紶鎺ュ彛
+                    auto: false,
+                    // multiple: true,
+                    // bindAction: '#HCarCardIDPic_BT_UploadFile',
+                    autoPreview: false,
+                    choose: function (obj) {
+                        // 閫夋嫨鏂囦欢鍚庯紝灏嗘枃浠惰В鏋愪负base64鍥剧墖鏍煎紡锛岄�氳繃瓒呴摼鎺ユ枃鏈瑙堝浘鐗�
+                        obj.preview(function (index, file, result) {
+                            console.log(index); // 寰楀埌鏂囦欢绱㈠紩
+                            console.log(file); // 寰楀埌鏂囦欢瀵硅薄
+                            console.log(result); // 寰楀埌鏂囦欢base64缂栫爜锛屾瘮濡傚浘鐗�
+
+                            // 灏嗘枃浠朵繚瀛樺埌鏈湴缂撳瓨锛岀瓑寰呬笂浼�
+                            uploadFiles.HCarCardIDPic = file
+                            // base64鏍煎紡鍥剧墖浣滀负棰勮椤硅緭鍑哄埌杈撳叆妗嗕腑
+                            $("#HCarCardIDPic").val(file.name)
+                            $("#HCarCardIDPic").css("cursor", "pointer")
+                            $("#HCarCardIDPic").closest("div").click(function () {
+                                console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                layui.event('showImageReview', 'click(showImageReview)', {
+                                    name: file.name,
+                                    src: result,
+                                });
+                            })
+
+                        })
+                    },
+                    before: function (obj) {
+                        // 鏂囦欢涓婁紶鍓嶅垽鏂槸鍚﹀～鍐欒溅鐗屽彿锛屼笉濉啓鏃犳硶涓婁紶鏂囦欢
+                        if (!$("#HNumber").val()) {
+                            layer.alert("杩樻湭濉啓杞︾墝鍙凤紝鏃犳硶涓婁紶鍥剧墖!", { icon: 5 });
+                            return false
+                        }
                     },
                     done: function (res) {
                         layer.msg('涓婁紶鎴愬姛');
@@ -597,7 +783,7 @@
                                 "HCarTypeID": data.杞﹀瀷,
                                 "HCarTypeName": data.杞﹀瀷鍚嶇О || "",
                                 "HCarPric": data.杞﹁締鐓х墖,
-                                "HCarCardIDPic": data.杞﹁締琛岄┒鐓х墖,
+                                "HCarCardIDPic": data.杞﹁締琛岄┒璇佺収鐗�,
                                 "HCompID": data.HCompID,
                                 "HCompName": data.鎵�灞炲叕鍙�,
                                 "HModel": data.杞﹁締鍨嬪彿,
@@ -614,6 +800,32 @@
                                 "HModifyEmp": data.淇敼浜�,
                                 "HModifyTime": data.淇敼鏃堕棿 ? util.toDateString(data.淇敼鏃堕棿, 'yyyy-MM-dd') : ""
                             });
+
+                            // 鑾峰彇鏈嶅姟鍣ㄥ熀鍦板潃
+                            var apiIndex = GetWEBURL().indexOf("/API/");
+                            var filePath = GetWEBURL().slice(0, apiIndex) + "/"
+                            if (data['杞﹁締鐓х墖']) {
+                                $("#HCarPric").css("cursor", "pointer")
+                                $("#HCarPric").closest("div").click(function () {
+                                    console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                    layui.event('showImageReview', 'click(showImageReview)', {
+                                        name: data.杞﹁締鐓х墖,
+                                        src: filePath + 'Files/Gy_Car/' + data["杞︾墝鍙�"] + "/HCarPric/" + data['杞﹁締鐓х墖'],
+                                    });
+                                })
+                            }
+
+                            if (data['杞﹁締琛岄┒璇佺収鐗�']) {
+                                $("#HCarCardIDPic").css("cursor", "pointer")
+                                $("#HCarCardIDPic").closest("div").click(function () {
+                                    console.log("瑙﹀彂浜嗙偣鍑讳簨浠�")
+                                    layui.event('showImageReview', 'click(showImageReview)', {
+                                        name: data['杞﹁締琛岄┒璇佺収鐗�'],
+                                        src: filePath + 'Files/Gy_Car/' + data["杞︾墝鍙�"] + "/HCarCardIDPic/" + data['杞﹁締琛岄┒璇佺収鐗�'],
+                                    });
+                                })
+                            }
+
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -634,7 +846,7 @@
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        url: GetWEBURL() + "/Gy_Car/AuditGy_Car", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                         success: function (result) {
                             if (result.count == 1) {
@@ -654,6 +866,8 @@
                     });
                 })
             }
+
+
 
             //#region 淇濆瓨鏂规硶
             function set_SaveBill(data) {
@@ -718,10 +932,14 @@
         }
 
         function GetHCar(data) {
-            debugger
             $("#HParentID").val(data[0]["hmainid"])
             $("#HParentName").val(data[0]["杞﹁締鍚嶇О"])
         }
+
+        function GetHCarType(data) {
+            $("#HCarTypeName").val(data[0]['杞﹀瀷鍚嶇О'])
+            $("#HCarTypeID").val(data[0]['HItemID'])
+        }
     </script>
 </body>
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Driver.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Driver.html"
new file mode 100644
index 0000000..18f5611
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Driver.html"
@@ -0,0 +1,590 @@
+锘�<!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/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>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>
+                                <li>鍏朵粬淇℃伅</li>
+                                <li>鍒跺崟淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <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="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+                                                <input type="hidden" lay-verify="HCREATEORGID" id="HCREATEORGID" name="HCREATEORGID" 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="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+                                            </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="HHelpCode" id="HHelpCode" autocomplete="off">
+                                            </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="HDeptName" readonly id="HDeptName"
+                                                       class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                                <input type="hidden" name="HDepNumber" id="HDepNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn"
+                                                        lay-filter="HDepart-BT" 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="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="1" title="鏄惁绂佺敤" disabled>
+                                                <input type="hidden" value="0" name="HStopflag" id="HStopflag">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label" style="width: 118px;">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 162px; width: 717px;">
+                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                </div>
+                                <div class="layui-tab-item">
+                                    <div class="layui-col-xs4 layui-inline">
+                                        <label class="layui-form-label">韬唤璇佸彿鐮�</label>
+                                        <div class="layui-input-inline">
+                                            <input type="text" name="identityID" id="identityID" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                            <!--<input type="hidden" name="HEmpID" id="HEmpID" value="0">-->
+
+                                        </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="Telephone" id="Telephone" autocomplete="off">
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-col-xs4 layui-inline">
+                                        <label class="layui-form-label">椹剧収绫诲瀷</label>
+                                        <div class="layui-input-inline">
+                                            <select name="LicenseType" id="LicenseType" lay-verify="LicenseType">
+                                                <option value="A1">A1</option>
+                                                <option value="A2">A2</option>
+                                                <option value="A3">A3</option>
+                                                <option value="B1">B1</option>
+                                                <option value="B2">B2</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-col-xs4 layui-inline">
+                                        <label class="layui-form-label">鍙告満绫诲瀷</label>
+                                        <div class="layui-input-inline">
+                                            <select name="DriverType" id="DriverType" lay-verify="DriverType">
+                                                <option value="鍥哄畾">鍥哄畾</option>
+                                                <option value="涓存椂">涓存椂</option>
+                                               
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                    <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
+                                </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="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>
+                                                </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>
+                                                </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="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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;
+           
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            }
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+            } else if (OperationType == 2) {//澶嶅埗
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $("#HItemID").val(0);
+                $("#HNumber").val('');
+                $("#HName").val('');
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HCheckEmp").val('');
+                $("#HCheckDate").val('');
+                $("#HStopEmp").val('');
+                $("#HStopDate").val('');
+            }
+            else if (OperationType == 3) {//缂栬緫
+                //绂佺敤缁勭粐閫夐」
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            ////閫夋嫨宸ュ簭鎸夐挳
+            //form.on('submit(HProc-BT)', function () {
+            //    get_checkProc();
+            //});
+            //閫夋嫨璐熻矗浜烘寜閽�
+            form.on('submit(HEmp-BT)', function () {
+                get_checkEmp();
+            });
+            ////閫夋嫨鑱屽憳鎸夐挳
+            //form.on('submit(HEmpID-BT)', function () {
+            //    get_checkEmpID();
+            //});
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+            ////閫夋嫨宸ヤ綔涓績鎸夐挳
+            //form.on('submit(HWorkingProcedure-BT)', function () {
+            //    get_checkWorkCenter();
+            //});
+
+            ////閫夋嫨鐝粍鎸夐挳
+            //form.on('submit(ProductionTeam-BT)', function () {
+            //    get_checkGroup();
+            //});
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //瀹℃牳
+            form.on('submit(set_CheckBill)', function (data) {
+                set_CheckBill(data);
+            });
+
+            //#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 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"])
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&Org=' + sessionStorage["Organization"], '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);
+                        $("#HDeptNumber").val(checkStatus.data[0].閮ㄩ棬浠ｇ爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Driver/cx",
+                    type: "GET",
+                    async: false,
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HNumber": data.椹鹃┒鍛樹唬鐮�
+                                , "HItemID": data.HItemID
+                                //, "HParentID": data.HParentID
+                                , "HName": data.椹鹃┒鍛樺悕绉�
+                                , "HHelpCode": data.鐭唬鐮�
+                                , "HDeptName": data.鎵�灞炲叕鍙稿悕绉�
+                                , "HDeptNumber": data.鎵�灞炲叕鍙镐唬鐮�
+                                , "HDeptID": data.鎵�灞炲叕鍙窱D
+                                , "HEmpName": data.HEmpName
+                                , "identityID": data.韬唤璇佸彿鐮�
+                                , "Telephone": data.鎵嬫満鍙风爜
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.HRemark
+                                , "HUSEORGID": data.HUSEORGID
+                                , "HRemark": data.澶囨敞
+                                , "LicenseType": data.椹剧収绫诲瀷
+                                , "DriverType": data.鍙告満绫诲瀷
+                                //, "HItemID": data.鏉＄爜缂栧彿
+                                //, "HBarCode": data.鏉″舰鐮�
+                                //, "HCreator": data.鍒涘缓浜�
+                                //, "lngBillKey": data.lngBillKey
+                                //, "lngBillSubKey": data.lngBillSubKey
+                                //, "HMaker": data.HMaker
+                                //, "HCreateDate": data.鍒涘缓鏃ユ湡
+                                //, "HUpDater": data.淇敼浜�
+                                //, "HUpDateDate": data.淇敼鏃ユ湡
+                                , "HMakeEmp": data["鍒涘缓浜�"]
+                                , "HMakeDate": data["鍒涘缓鏃ユ湡"] == null ? "" : Format(new Date(data["鍒涘缓鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HCheckEmp": data["瀹℃牳浜�"]
+                                , "HCheckDate": data["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HStopEmp": data["绂佺敤浜�"]
+                                , "HStopDate": data["绂佺敤鏃ユ湡"] == null ? "" : Format(new Date(data["绂佺敤鏃ユ湡"]), "yyyy-MM-dd")
+                               
+                            });
+                            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 set_CheckBill() {
+                layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                    var wait = layer.load();
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_Driver/AuditGy_Driver',
+                        type: "GET",
+                        data: { "HInterID": $("#HItemID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 });
+                                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);
+                                layer.close(wait);
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+                })
+            }
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                var sMainStr = JSON.stringify(data.field);
+                if (!$("#HNumber").val()) {
+                    layer.msg("璇疯緭鍏ラ┚椹跺憳浠ｇ爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HName").val()) {
+                    layer.msg("璇疯緭鍏ラ┚椹跺憳鍚嶇О锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //if (sessionStorage["OrganizationID"] != 100050) {
+                //    if ($("#HEmpID").val() == 0) {
+                //        layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //        return;
+                //    }
+                //}
+               
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_Driver/AddBill1", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').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
+
+            //#region 閫夋嫨璐熻矗浜烘柟娉�
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽憳鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?HType=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) { }
+                })
+            }
+            //#endregion
+
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Department.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
+
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        function GetHEmpValue(obj) {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html"
new file mode 100644
index 0000000..ed3539d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ItemMoney.html"
@@ -0,0 +1,382 @@
+锘�<!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/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>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="padding-top: 10px;">
+                            <div class="layui-tab layui-tab-brief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                    <li>鍏朵粬淇℃伅</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <h1 style="text-align:center;"><b>璐圭敤椤圭洰</b></h1>
+                                        <div class="layui-tab-content">
+                                            <div class="layui-tab-item layui-show">
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浠ｇ爜锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                            <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鏍囧噯鍗曚环</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HPrice" lay-verify="HPrice" id="HPrice" value="0" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">绯绘暟姣旂巼</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" name="HRate" lay-verify="HRate" id="HRate" value="0" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">鍒涘缓缁勭粐锛�</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HCREATEORGID" id="HCREATEORGID" lay-verify="HCREATEORGID">
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
+                                                        <div class="layui-input-inline">
+                                                            <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
+                                                                <option value="鏈娴�" selected>鏈娴�</option>
+                                                                <option value="鏈娇鐢�">鏈娇鐢�</option>
+                                                                <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+                                                            </select>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label" style="width: 120px"> 绂佺敤鏍囧織:</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-form-item">
+                                                    <div class="layui-col-xs11">
+                                                        <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                        <div class="layui-input-block">
+                                                            <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鍏朵粬淇℃伅-->
+                                    <div 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="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="HStopEmp" id="HStopEmp" 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>
+                                                    </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="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="HStopTime" id="HStopTime" 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>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//澶嶅埗
+                set_AddFNew();
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                set_EditForm(linterid);              
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "SaveGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainStr },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { icon: 1 });
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            else {
+                                f_alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            f_alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+           
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
+                $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUSEORGID").attr("disabled", true);
+                $("#HCREATEORGID").attr("disabled", true);
+                $("#HStopflag").attr("disabled", true);
+                $("#HUseFlag").attr("disabled", true);
+                layui.form.render('checkbox');
+            }
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Web/GetGy_ItemMoneyDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_ItemMoney_1[0];
+                            $("#HItemID").val(OperationType == 2 ? "0" : data.HItemID);//浠ｇ爜ID
+                            $("#HNumber").val(data.璐圭敤椤圭洰浠ｇ爜);//浠ｇ爜
+                            $("#HName").val(data.璐圭敤椤圭洰鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
+                            $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
+                            $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
+                            $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            $("#HPrice").val(data.鏍囧噯鍗曚环);
+                            $("#HRate").val(data.绯绘暟姣旂巼);
+
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囧織 == "鏄�" ? true : false);//true:閫変腑 false:涓嶉�変腑
+                            $("#HMakeEmp").val(data.鍒涘缓浜� == "" ? sessionStorage["HMaker"] : data.鍒涘缓浜�);
+                            $("#HMakeTime").val(data.鍒涘缓鏃堕棿 == null ? "" : Format(new Date(data.鍒涘缓鏃堕棿), "yyyy-MM-dd"));
+                            $("#HStopEmp").val(data.绂佺敤浜�);
+                            $("#HStopTime").val(data.绂佺敤鏃堕棿 == null ? "" : Format(new Date(data.绂佺敤鏃堕棿), "yyyy-MM-dd"));
+                            $("#HCheckEmp").val(data.瀹℃牳浜�);
+                            $("#HCheckTime").val(data.瀹℃牳鏃堕棿 == null ? "" : Format(new Date(data.瀹℃牳鏃堕棿), "yyyy-MM-dd"));
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+             //鑾峰彇鐧诲綍椤电粍缁囧垪
+            function Organ() {
+                var Organization = '';
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HUSEORGID").append(Organization);
+                            $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
+                            $("#HCREATEORGID").append(Organization);
+                            $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillEdit.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/Cg_ContractTransportBillEdit.html"
new file mode 100644
index 0000000..2eb1206
--- /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/Cg_ContractTransportBillEdit.html"
@@ -0,0 +1,1125 @@
+锘�<!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/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-label {
+            width: 85px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+         浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� 
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white; ">
+                    <div style="padding: 2px; ">
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鎵胯繍鍚堝悓</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍚堝悓绛捐鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HContractDate" name="HContractDate" id="HContractDate" style="padding-left: 80px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HSupName" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchHSup" id="btnSearchHSup" 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 style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="HDeptList" id="HDeptList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input" lay-verify="HSSName" name="HSSName" id="HSSName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSSID" id="HSSID" lay-verify="HSSID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" 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" lay-verify="HCurName" name="HCurName" id="HCurName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HCurID" id="HCurID" lay-verify="HCurID" value="0">
+                                                <button class="layui-btn" type="button" lay-submit="" lay-filter="HCurList" id="HCurList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓缂栧彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HContractNumber" name="HContractNumber" id="HContractNumber">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍚堝悓鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HContractName" name="HContractName" id="HContractName">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浜よ揣鍦扮偣</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <input type="text" class="layui-input" lay-verify="HAddress" name="HAddress" id="HAddress">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="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-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; ">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <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-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>
+                                    </div>
+                                </script>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <!--椤圭洰闃舵琛細鍒犻櫎-->
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨-->
+    <script type="text/html" id="HTransportTyep">
+        <select name="HTransportTyep" lay-filter="HTransportTyep" id="HTransportTyep{{d.LAY_TABLE_INDEX+1}}">
+            <option value="鍗曠▼">鍗曠▼</option>
+            <option value="寰�杩�">寰�杩�</option>
+        </select>
+    </script>
+
+    <script>
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , upload = layui.upload;
+
+            //妯″潡鍚�
+            var HModName = "Cg_ContractTransportBillList";
+            //#region
+
+            //鍏ㄥ眬鍙橀噺
+            window.OptionData = [];
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1117";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //#endregion
+
+
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+
+                OperationType = 1;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HContractDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鍒濆鍖栧瓙琛�
+                get_InitGrid();
+
+                //绂佺敤缁勭粐閫夐」
+                $('#HOrgID').attr("disabled", true);
+
+            }
+            else if (OperationType == 2) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new                                        //缂栬緫
+
+                //鍒濆鍖栭」鐩樁娈佃〃
+                get_InitGrid();
+                RoadBillMain(linterid);
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栨棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HContractDate").val(Format(new Date(), "yyyy-MM-dd"));
+                OperationType = 1;
+            }
+            else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+
+                //鍒濆鍖栧瓙琛�
+                get_InitGrid();
+
+                RoadBillMain(linterid);
+
+                //绂佺敤缁勭粐閫夐」
+                $('#HOrgID').attr("disabled", true);
+            }
+
+
+            //#endregion
+
+
+
+            //#region 鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨鐗╂枡鎸夐挳
+            form.on('submit(btnSearchHMater)', function () {
+                get_checkSearchHMater();
+            });
+            //#endregion
+
+
+            //#region 閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(btnSearchHSup)', function () {
+                get_checkSearchHProc();
+            });
+            //#endregion
+
+            //#region 閫夋嫨閿�鍞竵鍒寜閽�
+            form.on('submit(HCurList)', function () {
+                get_checkCur();
+            });
+            //#endregion
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+            //#endregion
+            //#endregion
+            //閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+            //#region
+            //缁撶畻鏂瑰紡寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡鍚嶇О);
+                        $("#HSSID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //#endregion
+
+            form.on('submit(btnSearchHSup)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+
+                var NewRow = {
+                    "HBeginAddr": "0", "HBeginAddrName": "", "HEndAddr": "0", "HEndAddrName": "", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
+                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HTransportTyep": "寰�杩�"
+                };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HTransportTyep' + i + '').find("option[value='" + option.data[i - 1].HTransportTyep + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HTransportTyep' + i + '').find("option[value='" + option.data[i - 1].HTransportTyep + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+
+                }
+            });
+
+
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+            //#endregion
+
+
+            //鐘舵��
+            form.on('select(HTransportTyep)', 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.HTransportTyep = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+
+            })
+
+            //#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>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            if (OperationType == 1) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+            //#region 閿�鍞竵鍒�夋嫨椤甸潰
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閿�鍞竵鍒垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].璐у竵鍚嶇О);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        $("#HExRate").val(checkStatus.data[0].姹囩巼)
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+            function get_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '涓氬姟鍛樺垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#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
+            //#region 瀛愯〃鍒濆鍖�
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , limit: 100
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        /*                        , { field: 'HPreventErrMouldID', title: 'HPreventErrMouldID', hide: true, style: 'background-color: #f9f9f9;' }*/
+                        , { field: 'HTransportLineName', title: '杩愯緭绾胯矾鍚嶇О', edit: 'text' }     //f7
+                        , { field: 'HBeginAddr', title: '濮嬪彂鍦癐D', edit: 'text', hide: true }     //f7
+                        , { field: 'HBeginAddrName', title: '濮嬪彂鍦�', edit: 'text', event: "HBeginAddrName" }     //f7
+                        , { field: 'HEndAddr', title: '鐩殑鍦癐D', edit: 'text', hide: true }     //f7
+                        , { field: 'HEndAddrName', title: '鐩殑鍦�', edit: 'text', event: "HEndAddrName" }     //f7
+                        , { field: 'HTransportCar', title: '杩愯緭鏂瑰紡', edit: 'text', hide: true }     //f7
+                        , { field: 'HTransportCarName', title: '杩愯緭鏂瑰紡', edit: 'text', event: "HTransportCarName" }     //f7
+                        , { field: 'HDistance', title: '璺濈锛堝叕閲岋級', edit: 'text' }
+                        , { field: 'HTransportTimes', title: '杩愯緭鏃舵晥', edit: 'text' }
+                        , { field: 'HTransportTyep', title: '杩愯緭绫诲瀷', templet: "#HTransportTyep" }
+                        , { field: 'HMoney', title: '杩愯緭璐圭敤', edit: 'text' }
+                        , { field: 'HMoney_His', title: '鍘嗗彶杩愯緭璐圭敤', edit: 'text' }
+                        , { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HBeginAddrName": ""
+                        ,"HBeginAddr": ""
+                        , "HEndAddrName": ""
+                        , "HEndAddr": ""
+                        , "HTransportLineName": ""
+                        , "HTransportCar": ""
+                        , "HTransportCarName": ""
+                        , "HDistance": ""
+                        , "HTransportTimes": ""
+                        , "HTransportTyep": ""
+                        , "HMoney": ""
+                        , "HMoney_His": ""
+
+                        , "HSourceInterID": "0"
+                        , "HSourceEntryID": "0"
+                        , "HSourceBillNo": ""
+                        , "HSourceBillType": ""
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    async: false,
+                    type: "GET",
+                    data: { "HBillType": '1117' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    }
+                });
+            }
+            //#endregion
+
+
+
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥     HEndAddr
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+
+                        if (obj.event == "HTransportCarName") {
+                            //
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "杩愯緭鏂瑰紡鍒楄〃"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeList.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({
+                                        "HTransportCar": checkStatus.data[0].HItemID,
+                                        "HTransportCarName": checkStatus.data[0].杞﹀瀷鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HTransportCar": OptionData.HItemID,
+                                            "HTransportCarName": OptionData.杞﹀瀷鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        if (obj.event == "HEndAddrName") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "鐩殑鍦板垪琛�"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_AreaSet.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({
+                                        "HEndAddr": checkStatus.data[0].HItemID,
+                                        "HEndAddrName": checkStatus.data[0].鍦板尯鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HEndAddr": checkStatus.data[0].HItemID,
+                                            "HEndAddrName": checkStatus.data[0].鍦板尯鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        if (obj.event == "HBeginAddrName") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"                           //鍔犱笂杈规
+                                , title: "浜嬪彂鍦板垪琛�"                             //鏍囬
+                                , closeBtn: 1                                       //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                                          //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]                              //绐椾綋澶у皬
+                                , maxmin: true                                      //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_AreaSet.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({
+                                        "HBeginAddr": checkStatus.data[0].HItemID,
+                                        "HBeginAddrName": checkStatus.data[0].鍦板尯鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , btn2: function (index, layero) { }
+                                , end: function () {
+                                    if (typeof (OptionData.HItemID) != "undefined") {
+                                        obj.update({
+                                            "HBeginAddr": checkStatus.data[0].HItemID,
+                                            "HBeginAddrName": checkStatus.data[0].鍦板尯鍚嶇О
+                                        })
+                                        OptionData = [];
+                                    }
+
+
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨HMaker
+            function set_AddNew(data) {
+
+
+                //鑾峰彇椤圭洰璐圭敤琛ㄦ暟鎹�
+                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])
+                    }
+                    if ($("#HTransportTyep" + (i + 1)).val()) {
+                        num[i].HTransportTyep = $("#HTransportTyep" + (i + 1)).val();
+                    }
+                }
+
+                //璁板綍鎿嶄綔绫诲瀷
+                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.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpdater").val(sessionStorage["HUserName"]);
+                    $("#HUpdaterDate").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"];
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Cg_ContractTransportBillListController/Save锘緾g_ContractTransportBillList",
+                    async: true,
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫 椤甸潰璧嬪��
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/Cg_ContractTransportBillListController/锘縀ditList",
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var tableMain = result.data;
+                        var tableSub = result.data;
+
+                        //涓昏〃 璧嬪��
+                        form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            "HInterID": tableMain[0]["HInterID"]
+                            , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+                            , "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HContractDate": tableMain[0]["鍚堝悓绛捐鏃ユ湡"]
+
+                            , "HSupID": tableMain[0]["HSupID"]
+                            , "HSupName": tableMain[0]["渚涘簲鍟嗗悕绉�"]
+                            , "HContractNumber": tableMain[0]["鍚堝悓缂栧彿"]
+                            , "HContractName": tableMain[0]["鍚堝悓鍚嶇О"]
+                            , "HAddress": tableMain[0]["浜よ揣鍦扮偣"]
+                            , "HSSID": tableMain[0]["缁撶畻鏂瑰紡"]
+                            , "HCurName": tableMain[0]["璐у竵鍚嶇О"]
+                            , "HCurID": tableMain[0]["甯佸埆"]
+                            , "HEmpID": tableMain[0]["HEmpID"]
+                            , "HEmpName": tableMain[0]["涓氬姟鍛樺悕绉�"]
+                            , "HDeptID": tableMain[0]["HDeptID"]
+                            , "HDeptName": tableMain[0]["閮ㄩ棬鍚嶇О"]
+
+                            , "HRemark": tableMain[0]["琛ㄥご澶囨敞"]
+                            , "HMaker": tableMain[0]["鍒跺崟浜�"]
+                            , "HUpDater": tableMain[0]["淇敼浜�"]
+                            , "HChecker": tableMain[0]["瀹℃牳浜�"]
+                            , "HMakeDate": tableMain[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HUpDateDate": tableMain[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCheckDate": tableMain[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HCloseMan": tableMain[0]["鍏抽棴浜�"]
+                            , "HCloseDate": tableMain[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                            , "HDeleteMan": tableMain[0]["浣滃簾浜�"]
+                            , "HDeleteDate": tableMain[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(tableMain[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+                        });
+                        //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                        HOrgIDBar = sessionStorage["OrganizationID"];
+
+                        //瀛愯〃  璧嬪��
+                        var rowdata = [];
+                        for (var i = 0; i < tableSub.length; i++) {
+                            rowdata.push(
+                                {
+                                    "HTransportLineName": tableSub[i]["杩愯緭绾胯矾鍚嶇О"],
+                                    "HBeginAddrName": tableSub[i]["濮嬪彂鍦�"],
+                                    "HEndAddrName": tableSub[i]["鐩殑鍦�"],
+                                    "HTransportCar": tableSub[i]["杩愯緭鏂瑰紡"],
+                                    "HDistance": tableSub[i]["璺濈"],
+                                    "HTransportTimes": tableSub[i]["杩愯緭鏃舵晥"],
+                                    "HTransportTyep": tableSub[i]["杩愯緭绫诲瀷"],
+                                    "HMoney": tableSub[i]["杩愯緭璐圭敤"],
+                                    "HMoney_His": tableSub[i]["鍘嗗彶杩愯緭璐圭敤"]
+                                }
+                            );
+                        }
+                        
+                        option.data = rowdata;
+                        table.render(option);
+                        form.render('select');
+                    }
+                })
+            }
+            //#endregion
+
+
+
+            //#region 椤圭洰闃舵琛細鍒犻櫎鎸囧畾琛�
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    //HTransportTyep
+                    layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1)
+                            option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 琛ㄥご鏁版嵁妫�楠�
+                if ($("#HBillNo").val() == "") {
+                    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                    return false;
+                }
+                if ($("#HDate").val() == "") {
+                    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                    return false;
+                }
+
+                //#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]["HPreventErrMouldID"] == "0") {
+                    //    layer.msg("绗�" + i + "琛岋細闃查敊瑁呯疆鏈�夋嫨锛�");
+                    //    return false;
+                    //}
+                }
+                //#endregion
+
+
+                return true;
+            }
+            //#endregion
+
+
+            //#endregion
+
+        });
+
+        //鐗╂枡
+        function GetGyMaterial(obj) {
+            $("#HMaterID").val(obj.HItemID);
+            $("#HMaterName").val(obj.鐗╂枡鍚嶇О);
+        }
+        //宸ュ簭
+        function GetProcessValue(obj) {
+            $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+            $("#HProcID").val(obj[0].HItemID);
+        }
+        //闃查敊瑁呯疆
+        function GetPreventErrMouldValue(obj) {
+            OptionData = obj;
+        }
+
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Cg_ContractTransportBillList.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/Cg_ContractTransportBillList.html"
new file mode 100644
index 0000000..5093c7a
--- /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/Cg_ContractTransportBillList.html"
@@ -0,0 +1,1221 @@
+锘�
+<!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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</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" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px;margin-left:5%;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                        <div class="layui-input-block" style="margin-left: 120px; 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>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class=" ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class=" ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div 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" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <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="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" 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" id="HideColumnButton"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , soulTable = layui.soulTable
+
+            var option = [];
+            var sWhere = "";
+            var HModName = "Cg_ContractTransportBillMainList";
+            var HBillType = "Cg_ContractTransportBillMainList";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var ins;                //鐢ㄤ簬瀵煎嚭excel
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID","HOrgID"];
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "浜у搧闃查敊楠岃瘉娓呭崟鍒楄〃";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //瀵煎叆
+                    case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBills(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBills(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBills(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBills(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;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#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
+
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                    get_FastQuery(2);
+
+                } else {
+                    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, 50000]
+                    , done: function (res, curr, count) {
+                        soulTable.render(this);
+                    }
+                };
+            }
+            //#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");
+                    }
+                })
+            }
+
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫'  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+                        end: function () {  //褰撳叧闂椂璋冪敤
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+             //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Cg_ContractTransportBillListController/get锘縇ist',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.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: '鍗曟嵁鍙�' });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                                ColFilter();
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HOrgID = $("#HOrgID").val(); //缁勭粐
+                //浠绘剰瀛楁杩囨护
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                //if (HOrgID) {
+                //    sWhere += " and HOrgID = '" + HOrgID + "'";
+                //}
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#HBillNo").val("");
+                $("#HBillStatus").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                form.render('select');
+
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+
+            //#region瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: './Cg_ContractTransportBillEdit_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+            //#endregion
+
+
+            //澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '浜у搧闃查敊楠岃瘉娓呭崟-鏂板'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '浜у搧闃查敊楠岃瘉娓呭崟-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Cg_ContractTransportBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'Cg_ContractTransportBillListController/Delete锘緽ill',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        get_Refresh();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 瀵煎嚭Execel
+            function btn_Export() {
+                table.exportFile(ins.config.id, option.data, "xls");
+            }
+            //#endregion
+
+            //#region 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂� 浣滃簾/鍙嶄綔搴�
+            //瀹℃牳/鍙嶅鏍�
+            function set_CheckBills(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸鏍稿悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+
+
+            //鍏抽棴/鍙嶅叧闂�
+            function set_CloseBills(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佸叧闂悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/CloseCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+
+
+            //浣滃簾/鍙嶄綔搴�
+            function set_DropBill(nums) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    layer.confirm("纭瑕佷綔搴熷悧?", function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            url: GetWEBURL() + '/Cg_ContractTransportBillEdit/DropCg_ContractTransportBillEdit',
+                            type: "GET",
+                            data: { "HInterID": InterID, "Type": nums, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+
+                                    layer.msg(result.Message, { icon: 1 });
+                                    layer.close(wait);
+                                    get_FastQuery();
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+            }
+            //#endregion
+
+            //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);     $("#ColName1").empty();
+                $("#ColName1").append(Organization);     $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29]; //valuelist鏁扮粍鍖呭惈涓庢椂闂寸浉鍏崇殑鏁存暟鍊�
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];  //itilelist涓巚aluelist鍊肩浉瀵逛簬鐨勮〃锛屼笖浣滀负涓嬫媺妗嗘枃鏈樉绀�
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';//瀹氫箟瀛楃涓睭InitTimeCycle_ArrayList 浣滅敤浜庝笅鎷夊垪鐨刪tml鍐呭 鍖呭惈option鍏冪礌锛屽�间负鈥�1锛屼笖鍦ㄤ笅鎷夋鏄剧ず浠绘剰闂撮殧
+                for (var i = 0; i < valueList.length; i++) {                                   // 閬嶅巻valueList  鏁扮粍  浣挎瘡涓�涓�肩敓鎴愪竴涓搴攐ption鍏冪礌
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';// 鎶婄敓鎴愮殑option鍏冪礌娣诲姞鍏InitTimeCycle_ArrayList瀛楃涓蹭腑
+                }
+
+                $("#HInitTimeCycle").empty();           //浣跨敤jquery鐨別mpty鏂规硶娓呯┖HInitTimeCycle_ArrayList <select>鍏冪礌鐨勫��
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);  //浣跨敤append鏂规硶鏋勫缓涔嬪墠HInitTimeCycle_ArrayList瀛楃涓� 鐨勫唴瀹逛紶鍏InitTimeCycle
+                form.render('select');       //璋冪敤 閲嶆柊娓叉煋select鍏冪礌
+
+                $("#HInitTimeCycle").val("29");   //浣跨敤jQuery鐨剉al()鏂规硶灏嗕笅鎷夊垪琛ㄧ殑閫変腑鍊艰缃负"29   锛屼笖鏄剧ず銆婅繎涓夋檪澶┿��
+            }
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var HOrgID = params[params[1]];
+                if (openType == 2) {
+                    sWhere += " and HBillStatus=2 ";
+                    $("#HOrgID").val(HOrgID);
+                    form.render("select");
+                    return true;
+                }
+                return false;
+            }
+            //#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);
+                                }
+                            }
+                            //鏌ヨ
+                            if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                                get_FastQuery(2);
+                            } else {
+                                get_FastQuery(1);
+                            }
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            //鏌ヨ
+                            if (addSWhereByOpenType()) {          //addSWhereByOpenType()鏂规硶鍒ゆ柇鏄惁鍏跺畠椤甸潰鎵撳紑鏈〉闈紝鑻ユ槸鍒欏鐞嗚繃婊ゆ潯浠讹紝骞惰繑鍥瀟rue
+                                get_FastQuery(2);
+                            } else {
+                                get_FastQuery(1);
+                            }
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+                    }
+                })
+            }
+
+            //#endregion
+
+
+        });
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.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_CarList.html"
index 72bbe20..54c1a61 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_CarList.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_CarList.html"
@@ -419,17 +419,29 @@
 
             //鍙屽嚮琛ㄦ牸浜嬩欢
             table.on('rowDouble(mainTable)', function (obj) {
-                if (window.top == window.self) {
-                    // 闈濱Frame椤甸潰鎵ц浠ｇ爜
+                // IFrame椤甸潰鎵ц浠ｇ爜
+                var data = [];
+                data.push(obj.data);
+                var index = parent.layer.getFrameIndex(window.name);
+                if(!index){
+                    // 闈炲脊鍑哄眰椤甸潰
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2,
+                        area: ['100%', '100%'],
+                        title: '杞﹁締-缂栬緫',
+                        shift: 0,
+                        content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+                        end: function () {
+                            // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+                            get_Refresh();
+                        }
+                    })
 
                     return
                 }
 
-                // IFrame椤甸潰鎵ц浠ｇ爜
-                var data = [];
-                data.push(obj.data);
                 parent.GetHCar(data);
-                var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
 
             })
@@ -507,7 +519,7 @@
                     //, cols: [[
                     //    { type: 'checkbox', fixed: 'left' }
                     //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
-                    //    , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+                    //    , { field: '杞︾墝鍙�', title: '杞︾墝鍙�' }
                     //    , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
                     //    , { field: '缁勭粐', title: '缁勭粐' }
                     //    , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
@@ -543,8 +555,8 @@
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
 
-                //鐢熶骇璧勬簮浠ｇ爜
-                if (obj.event == '鐢熶骇璧勬簮浠ｇ爜') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐢熶骇璧勬簮浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                //杞︾墝鍙�
+                if (obj.event == 'onCarNumberClickHandler') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '杞︾墝鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
                     var linterid = data.HItemID.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
                     layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞� 
                         type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -554,7 +566,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
                             get_FastQuery(table, option);
@@ -592,10 +604,10 @@
                                 }
                                 else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�  
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, 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: '鐢熶骇璧勬簮浠ｇ爜', templet: function (d) {
-                                            return '<span style="color: blue;">' + d.鐢熶骇璧勬簮浠ｇ爜 + '</span>'
+                                        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 {
@@ -704,16 +716,16 @@
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                             break;
                                         default:
-                                            //if (data[i].name === '鏉＄爜缂栧彿') {
-                                            //    col.push({
-                                            //        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
-                                            //        templet: function (d) {
-                                            //            return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
-                                            //        }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
-                                            //    });
-                                            //} else {
+                                            if (data[i].name === '杞︾墝鍙�') {
+                                                col.push({
+                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+                                                    templet: function (d) {
+                                                        return '<span style="color: blue;" lay-unrow >' + d.杞︾墝鍙� + '</span>'
+                                                    }, style: 'cursor: pointer;', event: 'onCarNumberClickHandler'
+                                                });
+                                            } else {
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
-                                        //}
+                                        }
                                     }
                                 }
                             }
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_DriverList.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_DriverList.html"
new file mode 100644
index 0000000..9e245dc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DriverList.html"
@@ -0,0 +1,1359 @@
+锘�<!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/HideButton_New.js"></script>
+
+</head>
+
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">椹鹃┒鍛樹唬鐮�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+                                               id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">椹鹃┒鍛樺悕绉�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="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;">
+                                        <select name="HUSEORGID" id="HUSEORGID" class="ForFilteringSchemes" lay-verify="HUSEORGID">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">
+                                    閲嶇疆
+                                </button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                         id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-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;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                        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;">
+                                                </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:5px">
+                                        <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:5px">
+                                        <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" id="toolbarDemo_ButtonSet">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></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="set_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_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "";
+            var option = [];
+            var Organization = sessionStorage["Organization"]
+            var HModName = "gy_driver";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "HUSEORGID", "HEmpID", "璐熻矗浜�"];
+            var params = get_UrlVars();
+            var openType = params[params[0]] == null ? 1 : params[params[0]];  //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+            var Type = params[params[1]];
+
+
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫� 
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "閮ㄩ棬鍒楄〃缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //瀵煎叆
+                    case 'set_SouceExcel': set_SouceExcel();
+                        break;
+                    //娴忚
+                    case 'get_PrintReport': get_PrintReport();
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        break;
+                    case 'set_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        var HBillType = "Gy_DepartmentList";
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                };
+            });
+            //#endregion       
+
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '閮ㄩ棬浠ｇ爜') {
+                    var linterid = data.HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閮ㄩ棬鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                }
+            });
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //浠ｇ爜鍥炶溅鏂规硶
+            $('#HNumber').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //鍚嶇О鍥炶溅鏂规硶
+            $('#HName').on('keydown', function (event) {
+                if (event.keyCode == 13) {
+                    get_FastQuery();
+                }
+            });
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 閲嶆柊鍚屾鎸夐挳
+            form.on('submit(btnResCnz)', function (data) {
+                set_ResCnz();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                switch (Type) {
+                    case "HDept1":
+                        parent.GetHDeptNameValue1(data);
+                        break;
+                    case "HDept2":
+                        parent.GetHDeptNameValue2(data);
+                        break;
+                    default:
+                        parent.GetHDeptNameValue(data);
+                        break;
+                }
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鏌ヨ
+                get_FastQuery();
+            }
+            //#endregion
+
+            //瀵煎叆
+            function set_SouceExcel() {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬瀵煎叆'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/excel/Gy_Department_Excel.html?OperationType=dao&HSouceBillType='
+                })
+            }
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //sWhere += addSWhereByOpenType();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_DriverController/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                //else if (data[i].name == '鎵�灞炲叕鍙�') {//娣诲姞瓒呴摼鎺�
+                                //    col.push({
+                                //        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '閮ㄩ棬浠ｇ爜', templet: function (d) {
+                                //            return '<span style="color: blue;">' + d.鎵�灞炲叕鍙稿悕绉� + '</span>'
+                                //        }, style: 'cursor: pointer;'
+                                //    });
+                                //}
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                            var HBillType = "Gy_DepartmentList";
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+                            layer.close(ajaxLoad);
+
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HNumber) {
+                    sWhere += " and 椹鹃┒鍛樹唬鐮� like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 椹鹃┒鍛樺悕绉� like '%" + HName + "%'";
+                }
+
+                //sWhere += getOrgIDByUser();//鐢ㄦ埛鍏宠仈缁勭粐鏌ヨ杩囨护
+
+                //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
+                get_Display(sWhere);
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                //sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+                $("#btnSearch").click();
+            }
+            //#endregion
+
+            //閲嶆柊鍚屾鎸夐挳
+            function set_ResCnz() {
+                var wait = layer.load()
+                var HNumber2 = $('#HNumber2').val();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Department/Gy_DepartmentViewApi',
+                    type: "GET",
+                    data: { "Number": HNumber2, "Type": 'BM', HUseOrgID: sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                window.location.reload();
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#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 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_DepartmentList_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '閮ㄩ棬鍒楄〃-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Driver.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+            //#region 澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '澶嶅埗-閮ㄩ棬鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Driver.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閮ㄩ棬鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Driver.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1 && data[0].瀹℃牳浜� === "") {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_Driver',
+                            type: "GET",
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾湭瀹℃牳鏁版嵁鍒犻櫎锛�');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Driver/AuditGy_Driver", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Driver/StopGy_Driver", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion                       
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                //鏍规嵁椤甸潰鐨勬墦寮�鏂瑰紡锛屽垽鏂繃婊ゆ潯浠舵槸鍚﹂渶瑕佽繘琛岄澶栫殑娣诲姞
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[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;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+
+                                //缁熻鍒�
+                                if (dataCols[6] == 1) {
+                                    option.cols[0][i + 1]["totalRow"] = true;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            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 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");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+            function getOrgIDByUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�       浼犲弬 缁勭粐蹇呴』鏄垪琛ㄥご閮ㄦ煡璇㈢殑缁勭粐  涓嶈兘浣跨敤鐢ㄦ埛榛樿            
+                    data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HUSEORGID").val() },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            if (result.data[0].sWhere == "1") {
+                                res = " and HUSEORGID = '" + $("#HUSEORGID").val() + "'";
+                            } else {
+                                res = result.data[0].sWhere;
+                            }
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+            }
+            //#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";
+                            //鎵ц鏌ヨ鏂规硶
+                            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");
+                        }
+                    }
+                })
+            }
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                let addSWhere = "";
+
+                if (typeof(openType) != "undefined") {
+                    if (openType == 1) {
+                        /*addSWhere = " and 绂佺敤鏍囪 = '' 瀹℃牳浜� !='' and 杞﹂棿鏍囪 = 'Y' " ;*/
+                        addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
+                    } else {
+                        addSWhere = " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> '' ";
+                    }
+                }
+                return addSWhere;
+            }
+            //#endregion
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+        //#endregion
+
+
+
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ItemMoney.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_ItemMoney.html"
new file mode 100644
index 0000000..5256e8d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ItemMoney.html"
@@ -0,0 +1,1083 @@
+锘�
+<!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/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">璐圭敤椤圭洰浠ｇ爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">璐圭敤椤圭洰鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                    </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" lay-verify="HOrgID" class="ForFilteringSchemes">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </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-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                                    <div class="layui-row" style="margin-top:5px">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">杩囨护</label>
+                                            <div class="layui-input-block">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <option value="0" selected="selected"></option>
+                                                <option value="=">=</option>
+                                                <option value=">=">>=</option>
+                                                <option value=">">></option>
+                                                <option value="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
+                                                <option value="7">鍖呭惈</option>
+                                                <option value="8">宸﹀寘鍚�</option>
+                                                <option value="9">鍙冲寘鍚�</option>
+                                                <option value="10">涓嶅寘鍚�</option>
+                                            </select>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                        </div>
+                                    </div>
+                                    <div 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" 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:5px">
+                                        <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" id="toolbarDemo_ButtonSet">
+                                <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="btn-Add" id="AddButton"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="EditButton"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="DeleteButton"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="AuditButton"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAuditButton"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="StopButton"> <i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStopButton"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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="set_HideButton" id="set_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_Refresh" id="RefreshButton"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="ExitButton"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                
+                            </div>
+                        </script>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HModName = "Gy_ItemMoney";
+            var HBillType = "Gy_ItemMoney";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HItemID", "鐭唬鐮� ", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HUSEORGID", "HCREATEORGID"];
+            var ins;                        //鐢ㄤ簬瀵煎嚭excel
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "璐圭敤椤圭洰鍒楄〃缁存姢";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //澶嶅埗
+                    case 'set_Copy': set_Copy();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //绂佺敤鎸夐挳
+                    case 'btn-Stop':
+                        set_De_Stop(0);
+                        break;
+                    //鍙嶇鐢ㄦ寜閽�
+                    case 'btn-DeStop':
+                        set_De_Stop(1);
+                        break;
+                    //瀵煎嚭excel
+                    case 'get_export':
+                        get_Export();
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(1);
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '璐圭敤椤圭洰浠ｇ爜') {
+                    var hID = data.HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璐圭敤椤圭洰'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+            });
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.GetProjectMoneyValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                btnrowDouble(obj);
+                // parent.layer.close(index);
+            });
+            //#endregion
+
+
+            function btnrowDouble(obj) {
+                var index = parent.layer.getFrameIndex(window.name);
+                var data = obj.data;
+                //杩斿洖鏂规硶
+                parent.GetProjectMoneyValue(data);
+                parent.layer.close(index);
+            }
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栫粍缁�
+                Organ();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                get_FastQuery();
+
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 5000, 50000]
+                    , limit: 50
+                    , cellMinWidth: 90
+
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+
+                    url: GetWEBURL() + '/Gy_BadReason/Gy_ItemMoneyList',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else if (data[i].name == '璐圭敤椤圭洰浠ｇ爜') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '璐圭敤椤圭洰浠ｇ爜', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.璐圭敤椤圭洰浠ｇ爜 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 'full-80'
+                                , page: true
+                                , limits: [50, 500, 5000, 50000]
+                                , limit: 50
+                                , cellMinWidth: 90
+                            }
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule();//鍔犺浇鏂规
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                layer.close(index);
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery(number) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HOrgID = $("#HOrgID").val();
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
+                }
+                if (HNumber) {
+                    sWhere += " and 璐圭敤椤圭洰浠ｇ爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 璐圭敤椤圭洰鍚嶇О like '%" + HName + "%'";
+                }
+                addSWhereByOpenType();
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+                $("#btnSearch").click();
+            }
+            //鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function 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>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璐圭敤椤圭洰',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //#region 澶嶅埗
+            function set_Copy() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '涓嶈壇鐜拌薄-澶嶅埗'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , cancel: function () {
+                        }
+                        , end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    if (!data[0].瀹℃牳浜� && !data[0].绂佺敤浜�) {
+                        layer.open({
+                            type: 2
+                            , area: ['100%', '100%']
+                            , title: '缂栬緫璐圭敤椤圭洰'
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_ItemMoney.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+                    }
+                    else {
+                        layer.msg('鍗曟嵁涓嶆槸鍒涘缓鐘舵�侊紒鏃犳硶缂栬緫锛�');
+                    }
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/AuditGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+            function set_De_Stop(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HItemID.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_BadReason/StopGy_ItemMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = get_UrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+
+                if (typeof (openType) != "undefined") {
+                    sWhere += " and ISNULL(瀹℃牳浜�,'')  != '' and 绂佺敤鏍囧織 !='鏄�'";
+                    return true;
+                }
+                return false;
+            }
+            //#endregion
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function get_DefaultModule() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                    type: "GET",
+                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+                            var data = data1.data;
+                            //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+                            HInterID_Choose = data[0].hmainid;
+                            //杩囨护鏂规鍐呯爜
+                            HInterID = data[0].hmainid
+                            //杩囨护鏂规鍚嶇О
+                            HDefaultFilter = data[0].鏂规鍚嶇О
+                            //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+                            var HRemark = data[0].澶囨敞
+                            //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+                            document.getElementById("HFilterScheme_Now").style.display = "block";
+                            document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                            //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+                            for (let i = 0; i < data.length; i++) {
+                                $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                                if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                    $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                                }
+                            }
+                            //鏌ヨ
+                            get_FastQuery();
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                            //鎵ц鏌ヨ鏂规硶
+                            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
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index d206b13..3981cde 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"
@@ -225,7 +225,12 @@
                 } else if (ListTrue[1] == 1) {
                     //鎵撳嵃宸ュ簭娴佽浆鍗″皬鏍囩
                     CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList_Small.aspx?linterid=" + ListTrue[0], true, "");
-                } else {
+                }
+                else if (ListTrue[1] == 2) {
+                    //鎵撳嵃宸ュ簭娴佽浆鍗″皬鏍囩
+                    CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_Sc_ProcessExchangeBillList_stock.aspx?linterid=" + ListTrue[0], true, "");
+                }
+                else {
                     CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + "_Sub.grf", "xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx?linterid=" + ListTrue[0], 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_Sc_ProcessExchangeBillList_stock.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_Sc_ProcessExchangeBillList_stock.aspx"
new file mode 100644
index 0000000..d1ebc9b
--- /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_Sc_ProcessExchangeBillList_stock.aspx"
@@ -0,0 +1,31 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_Sc_ProcessExchangeBillList_stock.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_Sc_ProcessExchangeBillList" %>
+
+<!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");
+
+            //20250731璋冩暣锛屾煡璇㈡墦鍗版暟鎹椂锛屾洿鏂版墦鍗版棩鏈熷埌娴佽浆鍗′富琛�
+            SqlXMLReportData.GenEntireData(this, "select  cast((cast( b.娴佹按鍙� as float)/10) as decimal(6,1)) 娴佹按鍙�,鐢熶骇璁㈠崟鍙�,a.鐢熶骇鏁伴噺,a.閿�鍞鍗曞彿,a.鎷嗗垎鍙�,a.娴佽浆鍗℃暟閲�,a.浜よ揣鏃ユ湡,a.浜у搧浠ｇ爜,a.鍗曟嵁鍙�,case when ISNULL(a.鐢熶骇瑙勬牸,'')='' then a.浜у搧瑙勬牸 else a.鐢熶骇瑙勬牸 end 浜у搧瑙勬牸,a.浜у搧鍚嶇О,a.鏃ユ湡,a.璁″垝瀹屽伐鏃ユ湡,a.鍗曟嵁鍙�,b.宸ュ簭鍚嶇О,b.妯″叿缂栧彿,b.宸ヨ壓鍙傛暟,b.鍔犲伐璇存槑,case when ISNULL(a.鐢熶骇骞呭,0)=0 then a.骞呭 else a.鐢熶骇骞呭 end 骞呭,case when ISNULL(a.鐢熶骇鍏嬮噸,0) = 0 then a.鍏嬮噸 else a.鐢熶骇鍏嬮噸 end 鍏嬮噸,a.鐧藉澂瑕佹眰,a.搴曢儴澶囨敞,a.瀹㈡埛,a.涓氬姟鍛�,a.姣涢珮,a.瀵告暟缁勭粐,a.鍏ㄦ瘺闀�,a.鍧竷瀵嗗害,a.姣涚罕鍚嶇О鍙婅鏍�,a.搴曚笣,a.杈呮暟閲�,a.杈呭姪鍗曚綅,a.瀹氬瀷娴嗘枡,a.浜よ揣鏃ユ湡,a.鏌撹壊瑕佹眰,a.杈呮暟閲�2,a.HAuxUnit2,a.杈呭姪鍗曚綅2,b.鍑虹珯鍏宠仈鏁伴噺 from h_v_Sc_ProcessExchangeBillQuery a left join h_v_Sc_ProcessExchangeBillQuerySub b on a.hmainid=b.hmainid   where b.hmainid in("+Request.Params["linterid"] +") order by cast(b.娴佹按鍙� as int)","update Sc_ProcessExchangeBillMain set HPrintQty1 = HPrintQty1+1 where HInterID in ("+Request.Params["linterid"] + ") and HPrintDate is null");
+
+           
+        }
+    </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_Sc_ProcessExchangeBillList_stock.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_Sc_ProcessExchangeBillList_stock.aspx.cs"
new file mode 100644
index 0000000..f91ae60
--- /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_Sc_ProcessExchangeBillList_stock.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_Sc_ProcessExchangeBillList_stock : 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\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
index a49faf9..030217a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>杞﹀瀷缁存姢</title>
@@ -16,6 +17,7 @@
     <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -41,6 +43,7 @@
                                         <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
                                 </div>
+<<<<<<< HEAD
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁勭粐鍚嶇О</label>
                                     <div class="layui-input-block" style="width: 185px;">
@@ -50,27 +53,38 @@
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+=======
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnSearch" id="btnSearch">
+>>>>>>> cf4a059eee9a05b9b181e9970167f9726379c004
                                     <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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                     <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+                                                <select 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;">
+                                            <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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -78,7 +92,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+                                            <input type="text" class="layui-input" value="" name="ColContent"
+                                                id="ColContent">
                                         </div>
                                     </div>
                                 </div>
@@ -233,6 +248,34 @@
             });
             //#endregion
 
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            //鍙屽嚮琛ㄦ牸浜嬩欢
+            table.on('rowDouble(mainTable)', function (obj) {
+                // IFrame椤甸潰鎵ц浠ｇ爜
+                var data = [];
+                data.push(obj.data);
+                var index = parent.layer.getFrameIndex(window.name);
+                if (!index) {
+                    // 闈炲脊鍑哄眰椤甸潰
+                    var linterid = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2,
+                        area: ['100%', '100%'],
+                        title: '杞﹀瀷-缂栬緫',
+                        shift: 0,
+                        content: '../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+                        end: function () {
+                            // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+                            get_Refresh();
+                        }
+                    })
+                    return
+                }
+                parent.GetHCarType(data);
+                parent.layer.close(index);
+
+            })
+
             //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -283,7 +326,7 @@
             }
             //#endregion
 
-            f//#region 鏌ヨ
+            //#region 鏌ヨ
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -361,7 +404,7 @@
                     }
                 });
             }
-//#endregion
+            //#endregion
             //#endregion
 
             //#region 蹇�熻繃婊�
@@ -478,7 +521,7 @@
                         $.ajax({
                             url: GetWEBURL() + 'Gy_CarType/delete',
                             type: "GET",
-                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"]},
+                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 }, function () {
@@ -761,4 +804,5 @@
     </script>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\350\260\203\346\213\250\347\224\263\350\257\267\345\215\225/Sc_MouldMoveStockRequestBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\350\260\203\346\213\250\347\224\263\350\257\267\345\215\225/Sc_MouldMoveStockRequestBillList.html"
index 4cbeaba..3bc2de5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\350\260\203\346\213\250\347\224\263\350\257\267\345\215\225/Sc_MouldMoveStockRequestBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\350\260\203\346\213\250\347\224\263\350\257\267\345\215\225/Sc_MouldMoveStockRequestBillList.html"
@@ -215,7 +215,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_PushMouldMoveStockBill" id="btn_PushMouldMoveStockBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_PushMouldProdMoveBill" id="btn_PushMouldProdMoveBill"><i class="layui-icon layui-icon-form"></i>涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -272,7 +272,7 @@
             var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
             var params = get_UrlVars();         //鑾峰彇椤甸潰璺宠浆鍙傛暟
             OperationType = params[params[0]] == null ? 1 : params[params[0]];  //鎿嶄綔绫诲瀷锛�1鐩存帴鎵撳紑銆�2浠庡埆鐨勬ā鍧楅�夋簮鍗曟墦寮�锛�
-            var HStockOrgID_Temp = params[params[1]] == null ? HStockOrgID : params[params[1]];   //缁勭粐ID
+            var HStockOrgID_Temp = params[params[1]] == null ? HStockOutOrgID : params[params[1]];   //缁勭粐ID
             var Type = params[params[2]] == null ? "3850" : params[params[2]];  //鐢ㄤ簬鍖哄垎鐣岄潰鏄剧ず鏁版嵁鎵�璋冪敤瑙嗗浘鐢�
             //#endregion
 
@@ -618,7 +618,7 @@
                     case 'btn_Edit': btn_Edit();
                         break;
                     //涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛夋寜閽�
-                    case 'btn_PushMouldMoveStockBill': btn_PushMouldMoveStockBill();
+                    case 'btn_PushMouldProdMoveBill': btn_PushMouldProdMoveBill();
                         break;
                     //鍒锋柊鎸夐挳
                     case 'btn_Refresh': btn_Refresh();
@@ -751,12 +751,13 @@
             //#endregion
 
             //#region 涓嬫帹锛堝櫒鍏风洿鎺ヨ皟鎷ㄥ崟锛�
-            function btn_PushMouldMoveStockBill() {
+            function btn_PushMouldProdMoveBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (data.length > 0) {
                     var dataArray = [];
                     var HSupTypeID_Temp = data[0]["HSupTypeID"];
+                    var HStockInOrgID_Temp = data[0]["HSTOCKORGINID"];
                     for (var i = 0; i < data.length; i++) {
                         if (data[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
                             var err = "涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + data[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒";
@@ -773,6 +774,11 @@
                             layer.alert(err, { icon: 5 });
                             return;
                         }
+                        if (data[i].HSTOCKORGINID != HStockInOrgID_Temp) {
+                            var err = "涓嬫帹澶辫触锛佹墍閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒";
+                            layer.alert(err, { icon: 5 });
+                            return;
+                        }
 
                         var temp = {
                             "hmainid": data[i].hmainid
@@ -785,7 +791,7 @@
                         "data": dataArray
                     };
 
-                    var url = encodeURI('../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockBillEdit.html?OperationType=4&HInterID=0&HSouceBillType=' + HBillType + '&res=' + JSON.stringify(datajson));
+                    var url = encodeURI('../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html?OperationType=4&HInterID=0&HSouceBillType=' + HBillType + '&res=' + JSON.stringify(datajson));
 
                     layer.open({
                         type: 2
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
new file mode 100644
index 0000000..0c8138a
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillEdit.html"
@@ -0,0 +1,2220 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鍣ㄥ叿棰嗙敤閫�搴撳崟</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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 class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Audit" id="btn_Audit">瀹℃牳</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_print" id="btn_print">鎵撳嵃</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-Bill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鍣ㄥ叿棰嗙敤閫�搴撳崟</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<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="HRedBlueFlag" id="HRedBlueFlag" value="false" >
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HStockOrgID" id="HStockOrgID" lay-filter="HStockOrgID" lay-verify="HStockOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寰�鏉ョ被鍨�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+                                                    <option value="1">渚涘簲鍟�</option>
+                                                    <option value="2">瀹㈡埛</option>
+                                                    <option value="3">杞﹂棿閮ㄩ棬</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <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-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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-inline">
+                                            <label class="layui-form-label">浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" 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-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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 class="layui-inline">
+                                            <label class="layui-form-label">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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-inline">
+                                            <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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 style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+                                                    <!--鍔ㄦ�佽幏鍙栨簮鍗�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 1135px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="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: 1135px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="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>
+
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鏄庣粏淇℃伅</li>
+                            <li>姹囨�讳俊鎭�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="SumTable" lay-filter="SumTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddLine" id="btn_AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InsertLine" id="btn_InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_CopyLine" id="btn_CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Up" id="btn_Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Under" id="btn_Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </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>
+        var OptionData = [];
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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 HModName = "Sc_MouldProdBackBillEdit";
+            var HBillType = "3803";
+            var HInterID = $('#HInterID').val()
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]    //缁勭粐ID
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+            var closeType = 2;          //鍏抽棴绫诲瀷
+            var option = [];
+            var Sumoption = [];
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();         //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            OperationType = params[params[0]] == null ? 1 : params[params[0]];          //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+            HInterID = params[params[1]] == null ? 0 : params[params[1]];               //鍗曟嵁鍐呯爜
+            var HSouceBillType = params[params[2]] == null ? "" : params[params[2]];    //婧愬崟绫诲瀷
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? $("h1").html() : get_PageTitle(HBillType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //鍒濆鍖栧瓙琛ㄥ苟鍒楄缃�
+            set_InitGrid();
+            DisPlay_HideColumn();
+            set_SumGrid();
+            DisPlay_HideColumn_Sum();
+
+            //#region   鑾峰彇缁勭粐
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    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>';
+                            }
+                            $("#HStockOrgID").append(Organization);
+                            $("#HStockOrgID").val(HStockOrgID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+            //#region   鑾峰彇婧愬崟绫诲瀷
+
+            //鍔ㄦ�佽幏鍙栨簮鍗曠被鍨�
+            SourceBillType();
+
+            function SourceBillType() {
+                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>';
+                            }
+                            $("#BillType").append(HSourceBillTypes);
+                            form.render('select');
+                        }
+                    }
+                })
+            }
+            //#endregion
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == undefined || OperationType == 1) {   //鏂板
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                OperationType = 1;
+                closeType = 2;
+            }
+            else if (OperationType == 2) {  //缂栬緫
+                $("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(HInterID);
+                closeType = 1;
+            }
+            else if (OperationType == 3) {  //澶嶅埗
+                //鏍规嵁鍐呯爜锛岃幏鍙栦俊鎭苟鍐欏叆鐣岄潰
+                RoadBillMain(HInterID);
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂淬�佸鏍镐汉銆佸鏍告棩鏈熴�佸叧闂汉銆佸叧闂棩鏈熴�佷慨鏀逛汉銆佷慨鏀规棩鏈熴�佷綔搴熶汉銆佷綔搴熸棩鏈�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HChecker").val("");
+                $("#HCheckDate").val("");
+                $("#HCloseMan").val("");
+                $("#HCloseDate").val("");
+                $("#HUpDater").val("");
+                $("#HUpDateDate").val("");
+                $("#HDeleteMan").val("");
+                $("#HDeleteDate").val("");
+                $('#btn_Save').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+                OperationType = 1;
+                closeType = 1;
+            }
+            else if (OperationType == 4) {  //涓嬫帹
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+                //璁剧疆婧愬崟绫诲瀷
+                $("#BillType").val(HSouceBillType);
+                //鑾峰彇婧愬崟鏁版嵁
+                var data = getUrlVars_JSON().data;
+                var dataArray = [];
+                for (var i = 0; i < data.length; i++) {
+                    var temp = GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType);
+                    if (temp != "none") {
+                        dataArray.push(temp);
+                    } else {
+                        var err = "鏈煡璇㈠埌鍗曟嵁鍙笅鎺ㄦ暟鎹紝璇峰埛鏂板崟鎹垪琛ㄥ悗閲嶆柊閫夋嫨鍗曟嵁涓嬫帹锛�";
+                        layer.alert(err, { icon: 5 });
+                        return;
+                    }
+                }
+                setInitBySourceBill(dataArray);
+                OperationType = 1;
+                closeType = 1;
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#region 鏂板妯″紡  鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNo_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                        else {
+                            $("#HBillNo").val("");
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+            //#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 RoadBillMain(HInterID) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HMaker": HMaker },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            if (data[0].瀹℃牳浜� != "") {
+                                $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            if (data[0].HSourceInterID != "0") {
+                                $("#HStockOrgID").attr("disabled", "disabled");
+                                form.render('select');
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data[0].鍗曟嵁鍙�
+                                , "HDate": formatDate(data[0].鏃ユ湡)
+                                , "HSupTypeID": data[0].HSupTypeID
+                                , "HSupID": data[0].HSupID
+                                , "HSupName": data[0].寰�鏉ュ崟浣�
+                                , "HDeptID": data[0].HDeptID
+                                , "HDeptName": data[0].閮ㄩ棬
+                                , "HWHID": data[0].HMainWHID
+                                , "HWHName": data[0].璋冨叆浠撳簱
+                                , "HEmpID": data[0].HEmpID
+                                , "HEmpName": data[0].涓氬姟鍛�
+                                , "HManagerID": data[0].HManagerID
+                                , "HManagerName": data[0].璐熻矗浜�
+                                , "HSecManagerID": data[0].HSecManagerID
+                                , "HSecManagerName": data[0].楠屾敹鍛�
+                                , "HKeeperID": data[0].HKeeperID
+                                , "HKeeperName": data[0].淇濈鍛�
+                                , "HExplanation": data[0].鎽樿
+                                , "HRemark": data[0].琛ㄥご澶囨敞
+                                , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+                                , "HStockOrgID": data[0].HMainStockOrgID
+                                , "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")
+                            });
+                            HStockOrgID = data[0].HMainStockOrgID == null ? 0 : data[0].HMainStockOrgID;
+
+                            //瀛愯〃  璧嬪��
+                            option.data = result.data[0];
+                            table.render(option);
+                            Sumoption.data = result.data[1];
+                            table.render(Sumoption);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏄庣粏淇℃伅鍒濆鍖�
+            function set_InitGrid() {
+                var topScroll = 0;
+                let disabled_color = '#e2e2e2';
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterNumber', title: '鍣ㄥ叿浠ｇ爜', width: 100, edit: 'text', event: "HMaterNumber" }     //F7
+                        , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, edit: 'text', event: "HUnitNumber" }       //F7
+                        , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HBatchNo', title: '鎵规', width: 100, hide: true, edit: 'text' }
+                        , { field: 'HQty', title: '瀹炴敹鏁伴噺', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHNumber', title: '浠撳簱浠ｇ爜', width: 100, edit: 'text', event: "HWHNumber" }   //F7
+                        , { field: 'HWHName', title: '浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPNumber', title: '浠撲綅浠ｇ爜', width: 100, edit: 'text', event: "HSPNumber" }         //F7
+                        , { field: 'HSPName', title: '浠撲綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCWHNumber', title: '璋冨嚭浠撳簱浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSCWHNumber" }   //F7
+                        , { field: 'HSCWHName', title: '璋冨嚭浠撳簱鍚嶇О', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCSPID', title: 'HSCSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCSPNumber', title: '璋冨嚭浠撲綅浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSCSPNumber" }         //F7
+                        , { field: 'HSCSPName', title: '璋冨嚭浠撲綅鍚嶇О', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceInterID', title: 'HSourceInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceBillType', title: 'HSourceBillType', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, hide: true, edit: 'text' }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HMoney', title: '閲戦', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HDesignLife', title: '璁捐瀵垮懡', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HPOOrderInterID', title: 'HPOOrderInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HPOOrderEntryID', title: 'HPOOrderEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderInterID', title: 'HSeOrderInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderEntryID', title: 'HSeOrderEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOWNERID', title: 'HOWNERID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOWNERTYPEID', title: 'HOWNERTYPEID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HUseLife', title: 'HUseLife', width: 100, hide: true, style: 'background:  ' + disabled_color, totalRow: true }
+                        , { field: 'HUseLifeQty', title: 'HUseLifeQty', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNewLifeQty', title: 'HNewLifeQty', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HQtyRel', title: 'HQtyRel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNewModel', title: 'HNewModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HWallThickness', title: 'HWallThickness', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HHardness', title: 'HHardness', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HLastProdModel', title: 'HLastProdModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HDiameter', title: 'HDiameter', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HBackFlag', title: 'HBackFlag', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HBarCode', title: 'HBarCode', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HMouldType', title: 'HMouldType', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HInitModel', title: 'HInitModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HInitDesignLife', title: 'HInitDesignLife', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HLifeUnitID', title: 'HLifeUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNowModel', title: 'HNowModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNowLife', title: 'HNowLife', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HCorrespondentTypeID', title: 'HCorrespondentTypeID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HCorrespondentID', title: 'HCorrespondentID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                }
+
+                var rowdata = [{
+                    "HMaterID": "0"
+                    , "HMaterNumber": ""
+                    , "HMaterName": ""
+                    , "HMaterModel": ""
+                    , "HUnitID": "0"
+                    , "HUnitNumber": ""
+                    , "HUnitName": ""
+                    , "HBatchNo": ""
+                    , "HQty": "0"
+                    , "HWHID": "0"
+                    , "HWHNumber": ""
+                    , "HWHName": ""
+                    , "HSPID": "0"
+                    , "HSPNumber": ""
+                    , "HSPName": ""
+                    , "HSCWHID": "0"
+                    , "HSCWHNumber": ""
+                    , "HSCWHName": ""
+                    , "HSCSPID": "0"
+                    , "HSCSPNumber": ""
+                    , "HSCSPName": ""
+                    , "HSourceInterID": "0"
+                    , "HSourceEntryID": "0"
+                    , "HSourceBillType": ""
+                    , "HSourceBillNo": ""
+                    , "HRelationQty": "0"
+                    , "HRelationMoney": "0"
+                    , "HRemark": ""
+                    , "HPropertyID": "0"
+                    , "HSecUnitID": "0"
+                    , "HSecUnitRate": "0"
+                    , "HQtyMust": "0"
+                    , "HPrice": "0"
+                    , "HMoney": "0"
+                    , "HDesignLife": "0"
+                    , "HLeaveLife": "0"
+                    , "HPOOrderInterID": "0"
+                    , "HPOOrderEntryID": "0"
+                    , "HPOOrderBillNo": ""
+                    , "HSeOrderInterID": "0"
+                    , "HSeOrderEntryID": "0"
+                    , "HSeOrderBillNo": ""
+                    , "HSTOCKORGID": HStockOrgID
+                    , "HOtherOrgID": HStockOrgID
+                    , "HOWNERID": HStockOrgID
+                    , "HOWNERTYPEID": ""
+                    , "HUseLife": "0"
+                    , "HUseLifeQty": "0"
+                    , "HNewLifeQty": "0"
+                    , "HQtyRel": "0"
+                    , "HSPGroupID": "0"
+                    , "HNewModel": ""
+                    , "HWallThickness": ""
+                    , "HHardness": ""
+                    , "HLastProdModel": ""
+                    , "HDiameter": ""
+                    , "HBackFlag": ""
+                    , "HBarCode": ""
+                    , "HMouldType": "0"
+                    , "HInitModel": ""
+                    , "HInitDesignLife": "0"
+                    , "HLifeUnitID": "0"
+                    , "HNowModel": ""
+                    , "HNowLife": "0"
+                    , "HCorrespondentTypeID": "0"
+                    , "HCorrespondentID": "0"
+                }];
+
+                option.data = rowdata;
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 姹囨�讳俊鎭垵濮嬪寲
+            function set_SumGrid() {
+                let disabled_color = '#e2e2e2';
+                Sumoption = {
+                    elem: '#SumTable'
+                    , totalRow: true
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { field: 'HMaterNumber_S', title: '鐗╂枡浠ｇ爜', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterName_S', title: '鐗╂枡鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterModel_S', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HBatchNo_S', title: '鎵规', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HQty_S', title: '鏁伴噺', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHNumber_S', title: '浠撳簱浠ｇ爜', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHName_S', title: '浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                    ]]
+                }
+
+                var Sumrowdata = [{
+                    "HMaterNumber_S": ""
+                    , "HMaterName_S": ""
+                    , "HMaterModel_S": ""
+                    , "HBatchNo_S": ""
+                    , "HQty_S": ""
+                    , "HWHNumber_S": ""
+                    , "HWHName_S": ""
+                }];
+
+                Sumoption.data = Sumrowdata;
+                table.render(Sumoption);
+            }
+            //#endregion
+
+            //#region 涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
+            //寰�鏉ョ被鍨�
+            form.on('select(HSupTypeID)', function (data) {
+                $("#HSupID").val("");
+                $("#HSupName").val("");
+            });
+
+            //缁勭粐
+            form.on('select(HStockOrgID)', function (data) {
+                if (HStockOrgID != $('#HStockOrgID').val()) {
+                    HStockOrgID = $('#HStockOrgID').val()
+                    $("#HWHID").val("0");
+                    $("#HWHName").val("");
+                    var data = table.cache["mainTable"];
+                    for (const row of data) {
+                        row.HSTOCKORGINID = HStockOrgID;
+                        row.HOWNERINID = HStockOrgID;
+                        row.HWHID = 0;
+                        row.HWHNumber = "";
+                        row.HWHName = "";
+                        row.HSPID = 0;
+                        row.HSPNumber = "";
+                        row.HSPName = "";
+                    }
+                    option.data = data;
+                    table.render(option);
+                }
+            });
+
+            //#endregion
+
+            //#region 閫夋嫨寮圭獥浜嬩欢
+
+            //#region 閫夋嫨寰�鏉ュ崟浣嶆寜閽�
+            form.on('submit(HSupList)', function () {
+                if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
+                    return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
+                }
+                get_checkSup();
+            });
+
+            function getSupType() {
+                var type = $("#HSupTypeID").val();
+                console.log(type)
+                switch (type) {
+                    case '1':
+                        return "../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup";
+                        break;
+                    case '2':
+                        return "../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html";
+                        break;
+                    case '3':
+                        return "../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&Type=HDept1";
+                        break;
+                }
+            }
+
+            function get_checkSup() {
+                var url = getSupType();
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "寰�鏉ュ崟浣嶅垪琛�"     //鏍囬
+                    , 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 != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉� == undefined ? (checkStatus.data[0].閮ㄩ棬鍚嶇О == undefined ? checkStatus.data[0].瀹㈡埛鍚嶇О : checkStatus.data[0].閮ㄩ棬鍚嶇О) : checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            function get_checkDept() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "閮ㄩ棬鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&Type=HDept2', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+
+            function get_checkWH() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "浠撳簱鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWH&', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        $("#HWHNumber").val(checkStatus.data[0].浠撳簱浠ｇ爜);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { },
+                    end: function () {
+                        var data = table.cache["mainTable"];
+                        for (const row of data) {
+                            row.HWHID = $("#HWHID").val();
+                            row.HWHNumber = $("#HWHNumber").val();
+                            row.HWHName = $("#HWHName").val();
+                            row.HSPID = 0;
+                            row.HSPNumber = "";
+                            row.HSPName = "";
+                        }
+                        option.data = data;
+                        table.render(option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            function get_checkEmp() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨璐熻矗浜烘寜閽�
+            form.on('submit(HManagerList)', function () {
+                get_checkManger();
+            });
+
+            function get_checkManger() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨婧愬崟鎸夐挳
+            form.on('submit(HMainSource)', function () {
+                get_checkMainSource();
+            });
+
+            function get_checkMainSource() {
+                var url = "";
+                var HSourceTitle = "";
+                if ($("#BillType").val() == "3851") {
+                    url = "../../妯℃不鍏风鐞�/鍣ㄥ叿鍏ュ簱鐢宠鍗�/Sc_MouldInRequestBillList.html?openType=2&HOrgID=" + HStockOrgID + "&Type=" + HBillType;
+                    HSourceTitle = "鍣ㄥ叿鍏ュ簱鐢宠鍗�";
+                } else {
+                    return layer.msg('鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭紒');
+                }
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , 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 HSupTypeID_Temp = checkStatus.data[0]["HSupTypeID"];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HSupTypeID"] != HSupTypeID_Temp) {
+                                var err = "鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒";
+                                layer.alert(err, { icon: 5 });
+                                return;
+                            }
+                        }
+                        //鑾峰彇婧愬崟鏁版嵁
+                        var dataArray = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            var temp = GetSourceBillList(checkStatus.data[i]["hmainid"], checkStatus.data[i]["hsubid"], checkStatus.data[i]["HBillType"]);
+                            if (temp != "none") {
+                                dataArray.push(temp);
+                            } else {
+                                var err = "鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�";
+                                layer.alert(err, { icon: 5 });
+                                return;
+                            }
+                        }
+                        setInitBySourceBill(dataArray);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region  杩斿洖婧愬崟鏁版嵁
+
+            //#region  鑾峰彇婧愬崟鏁版嵁
+            function GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) {
+                var res = "none";
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldProdBackBillController/GetSourceBill_MouldProdBack_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data[0];
+                        } else {
+                            res = "none";
+                        }
+                    },
+                    error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //#region  鍐欏叆婧愬崟鏁版嵁
+            function setInitBySourceBill(dataArray) {
+                var data = dataArray[0];
+                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                    "HSupTypeID": data.HSupTypeID
+                    , "HSupID": data.HSupID
+                    , "HSupName": data.HSupName
+                    , "HDeptID": data.HDeptID
+                    , "HDeptName": data.HDeptName
+                    , "HStockOrgID": data.HStockOrgID
+                });
+                HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
+
+                //绂佺敤缁勭粐閫夐」
+                $("#HStockOrgID").attr("disabled", "disabled");
+                form.render('select');
+
+                //瀛愯〃  璧嬪��
+                var rowdata = [];
+                for (let i = 0; i < dataArray.length; i++) {
+                    rowdata.push(
+                        {
+                            "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+                            , "HMaterNumber": dataArray[i].HMaterNumber == null ? "" : dataArray[i].HMaterNumber
+                            , "HMaterName": dataArray[i].HMaterName == null ? "" : dataArray[i].HMaterName
+                            , "HMaterModel": dataArray[i].HMaterModel == null ? "" : dataArray[i].HMaterModel
+                            , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+                            , "HUnitNumber": dataArray[i].HUnitNumber == null ? "" : dataArray[i].HUnitNumber
+                            , "HUnitName": dataArray[i].HUnitName == null ? "" : dataArray[i].HUnitName
+                            , "HBatchNo": ""
+                            , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                            , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+                            , "HWHNumber": dataArray[i].HWHNumber == null ? "" : dataArray[i].HWHNumber
+                            , "HWHName": dataArray[i].HWHName == null ? "" : dataArray[i].HWHName
+                            , "HSPID": "0"
+                            , "HSPNumber": ""
+                            , "HSPName": ""
+                            , "HSCWHID": "0"
+                            , "HSCWHNumber": ""
+                            , "HSCWHName": ""
+                            , "HSCSPID": "0"
+                            , "HSCSPNumber": ""
+                            , "HSCSPName": ""
+                            , "HSourceInterID": dataArray[i].HInterID == null ? 0 : dataArray[i].HInterID
+                            , "HSourceEntryID": dataArray[i].HEntryID == null ? 0 : dataArray[i].HEntryID
+                            , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+                            , "HSourceBillNo": dataArray[i].HBillNo == null ? "" : dataArray[i].HBillNo
+                            , "HRelationQty": "0"
+                            , "HRelationMoney": "0"
+                            , "HRemark": ""
+                            , "HPropertyID": "0"
+                            , "HSecUnitID": "0"
+                            , "HSecUnitRate": "0"
+                            , "HQtyMust": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                            , "HPrice": "0"
+                            , "HMoney": "0"
+                            , "HDesignLife": "0"
+                            , "HLeaveLife": "0"
+                            , "HPOOrderInterID": "0"
+                            , "HPOOrderEntryID": "0"
+                            , "HPOOrderBillNo": ""
+                            , "HSeOrderInterID": "0"
+                            , "HSeOrderEntryID": "0"
+                            , "HSeOrderBillNo": ""
+                            , "HSTOCKORGID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                            , "HOtherOrgID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                            , "HOWNERID": dataArray[i].HStockOrgID == null ? 0 : dataArray[i].HStockOrgID
+                            , "HOWNERTYPEID": ""
+                            , "HUseLife": "0"
+                            , "HUseLifeQty": "0"
+                            , "HNewLifeQty": "0"
+                            , "HQtyRel": "0"
+                            , "HSPGroupID": "0"
+                            , "HNewModel": ""
+                            , "HWallThickness": ""
+                            , "HHardness": ""
+                            , "HLastProdModel": ""
+                            , "HDiameter": ""
+                            , "HBackFlag": ""
+                            , "HBarCode": ""
+                            , "HMouldType": "0"
+                            , "HInitModel": ""
+                            , "HInitDesignLife": "0"
+                            , "HLifeUnitID": "0"
+                            , "HNowModel": ""
+                            , "HNowLife": "0"
+                            , "HCorrespondentTypeID": "0"
+                            , "HCorrespondentID": "0"
+                        }
+                    )
+                }
+                option.data = rowdata;
+                table.render(option);
+            }
+            //#endregion
+
+            //#endregion
+
+            //#endregion
+
+            //#region 瀛愯〃鐩稿叧鐩戝惉
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": "0"
+                    , "HMaterNumber": ""
+                    , "HMaterName": ""
+                    , "HMaterModel": ""
+                    , "HUnitID": "0"
+                    , "HUnitNumber": ""
+                    , "HUnitName": ""
+                    , "HBatchNo": ""
+                    , "HQty": "0"
+                    , "HWHID": "0"
+                    , "HWHNumber": ""
+                    , "HWHName": ""
+                    , "HSPID": "0"
+                    , "HSPNumber": ""
+                    , "HSPName": ""
+                    , "HSCWHID": "0"
+                    , "HSCWHNumber": ""
+                    , "HSCWHName": ""
+                    , "HSCSPID": "0"
+                    , "HSCSPNumber": ""
+                    , "HSCSPName": ""
+                    , "HSourceInterID": "0"
+                    , "HSourceEntryID": "0"
+                    , "HSourceBillType": ""
+                    , "HSourceBillNo": ""
+                    , "HRelationQty": "0"
+                    , "HRelationMoney": "0"
+                    , "HRemark": ""
+                    , "HPropertyID": "0"
+                    , "HSecUnitID": "0"
+                    , "HSecUnitRate": "0"
+                    , "HQtyMust": "0"
+                    , "HPrice": "0"
+                    , "HMoney": "0"
+                    , "HDesignLife": "0"
+                    , "HLeaveLife": "0"
+                    , "HPOOrderInterID": "0"
+                    , "HPOOrderEntryID": "0"
+                    , "HPOOrderBillNo": ""
+                    , "HSeOrderInterID": "0"
+                    , "HSeOrderEntryID": "0"
+                    , "HSeOrderBillNo": ""
+                    , "HSTOCKORGID": HStockOrgID
+                    , "HOtherOrgID": HStockOrgID
+                    , "HOWNERID": HStockOrgID
+                    , "HOWNERTYPEID": ""
+                    , "HUseLife": "0"
+                    , "HUseLifeQty": "0"
+                    , "HNewLifeQty": "0"
+                    , "HQtyRel": "0"
+                    , "HSPGroupID": "0"
+                    , "HNewModel": ""
+                    , "HWallThickness": ""
+                    , "HHardness": ""
+                    , "HLastProdModel": ""
+                    , "HDiameter": ""
+                    , "HBackFlag": ""
+                    , "HBarCode": ""
+                    , "HMouldType": "0"
+                    , "HInitModel": ""
+                    , "HInitDesignLife": "0"
+                    , "HLifeUnitID": "0"
+                    , "HNowModel": ""
+                    , "HNowLife": "0"
+                    , "HCorrespondentTypeID": "0"
+                    , "HCorrespondentID": "0"
+                };
+
+                switch (obj.event) {
+                    //澧炲姞涓�琛�
+                    case 'btn_AddLine': btnAddLine(NewRow);
+                        break;
+                    //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+                    case 'btn_InsertLine': btnInsertLine(NewRow)
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn_CopyLine': btnCopyLine(data);
+                        break;
+                    //涓婄Щ
+                    case 'btn_Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn_Under': btn_under();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
+            function btnInsertLine(NewRow) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var tables = [];                                    //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        tables.push(option.data[i]);
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            tables.push(NewRow);
+                        }
+                    }
+                    option.data = tables;
+                    table.render(option);
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+            //#endregion
+
+            //#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 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({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹� 姹囨�婚〉绛�
+            function DisPlay_HideColumn_Sum() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < Sumoption.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    Sumoption.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    Sumoption.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    Sumoption.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    Sumoption.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(Sumoption.cols[0][i + 1]["title"], titleData) == -1) {
+                                    Sumoption.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        Sumoption.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        Sumoption.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        Sumoption.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < Sumoption.cols[0].length - 1; i++) {
+                                if (Sumoption.cols[0][i]["fixed"] != null) {
+                                    Sumoption.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(Sumoption.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    Sumoption.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(Sumoption);
+                        } else {
+                            table.render(Sumoption);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            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);
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+            //#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') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            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 == "HMaterNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "鍣ㄥ叿鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', '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("璇烽�夋嫨鏁版嵁");
+                                    }
+                                    OptionData = checkStatus.data[0];
+                                    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, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HQty": 0, "HWHID": 0, "HWHNumber": "", "HWHName": "", "HSPID": 0, "HSPNumber": "", "HSPName": "", "HSCWHID": 0, "HSCWHNumber": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPNumber": "", "HSCSPName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillType": "", "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HPropertyID": 0, "HSecUnitID": 0, "HSecUnitRate": 0, "HQtyMust": 0, "HPrice": 0, "HMoney": 0, "HDesignLife": 0, "HLeaveLife": 0, "HPOOrderInterID": 0, "HPOOrderEntryID": 0, "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HSTOCKORGID": HStockOrgID, "HOtherOrgID": HStockOrgID, "HOWNERID": HStockOrgID, "HOWNERTYPEID": "", "HUseLife": 0, "HUseLifeQty": 0, "HNewLifeQty": 0, "HQtyRel": 0, "HSPGroupID": 0, "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HBarCode": "", "HMouldType": 0, "HInitModel": "", "HInitDesignLife": 0, "HLifeUnitID": 0, "HNowModel": "", "HNowLife": 0, "HCorrespondentTypeID": 0, "HCorrespondentID": 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].hmainid;
+                                            option.data[rowIndex + i].HMaterNumber = checkStatus.data[i].妯″叿缂栧彿;
+                                            option.data[rowIndex + i].HMaterName = checkStatus.data[i].妯″叿鍚嶇О;
+                                            option.data[rowIndex + i].HMaterModel = checkStatus.data[i].妯″叿鍨嬪彿;
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+                                            option.data[rowIndex + i].HUnitNumber = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
+                                            option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅;
+                                            option.data[rowIndex + i].HQty = 1;
+                                        }
+                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                    }
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData) != "undefined" && OptionData != []) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            HMaterID: OptionData.hmainid,
+                                            HMaterNumber: OptionData.妯″叿缂栧彿,
+                                            HMaterName: OptionData.妯″叿鍚嶇О,
+                                            HMaterModel: OptionData.妯″叿鍨嬪彿,
+                                            HUnitID: OptionData.HUnitID,
+                                            HUnitNumber: OptionData.璁￠噺鍗曚綅浠ｇ爜,
+                                            HUnitName: OptionData.璁￠噺鍗曚綅,
+                                            HDesignLife: 0,  //璁捐瀵垮懡
+                                            HLeaveLife: 0,   //鍓╀綑瀵垮懡
+                                            HQty: 1,         //瀹炴敹鏁伴噺
+                                            HMoney: 0,       //閲戦
+                                        });
+                                    }
+                                    OptionData = [];
+                                }
+                            })
+                        }
+                        //璁￠噺鍗曚綅
+                        if (obj.event == "HUnitNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "璁￠噺鍗曚綅鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?openType=2', '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];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HUnitID": OptionData.HItemID
+                                        , "HUnitNumber": OptionData.璁￠噺鍗曚綅浠ｇ爜
+                                        , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //浠撳簱
+                        if (obj.event == "HWHNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    OptionData = checkStatus.data[0];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HItemID
+                                        , "HWHNumber": OptionData.浠撳簱浠ｇ爜
+                                        , "HWHName": OptionData.浠撳簱鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //浠撲綅
+                        if (obj.event == "HSPNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撲綅鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html?openType=2', '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];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HWHID
+                                        , "HWHNumber": OptionData.HWHNumber
+                                        , "HWHName": OptionData.鎵�灞炰粨搴�
+                                        , "HSPID": OptionData.HMainID
+                                        , "HSPNumber": OptionData.浠撲綅浠ｇ爜
+                                        , "HSPName": OptionData.浠撲綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(btn_Save)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                //鑾峰彇瀛愯〃鏁版嵁
+                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])
+                    }
+                }
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //瀛愯〃鏁版嵁搴忓垪鍖�
+                var sSubStr = JSON.stringify(num);
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + HMaker;
+
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Save_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.close(index);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function (err) {
+                        layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.close(index);
+                    }
+                });
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 瀹℃牳
+            form.on('submit(btn_Audit)', function (data) {
+                HInterID = $('#HInterID').val()
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Check_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HInterID": HInterID, "Type": 1, "HMaker": HMaker },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                $("btn-check").addClass('layui-btn-disabled').attr('disabled', true)
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#region 鎵撳嵃
+            form.on("submit(btn_print)", function (data) {
+                HInterID = $('#HInterID').val()
+                if (HInterID != "" || HInterID != null) {
+                    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=' + HInterID.toString() + '&Type=HMouldProdBackBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+                }
+            });
+
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btn_Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(closeType);
+                });
+            })
+            //#endregion
+
+            //#endregion
+
+            //鐩戝惉鍗曞厓鏍肩紪杈�
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+                // 璇ョ洃鍚嚱鏁扮殑obj涓殑update鍑芥暟鏈夐棶棰橈紝浣跨敤琛ㄧ紦瀛樺姞绱㈠紩鐨勬柟寮忔洿鏂板搴斿垪鐨勬暟鎹�
+                let tableCache = table.cache['mainTable']
+                let index = $(obj.tr[0]).closest('tr').data('index');
+
+                switch (field) {
+                    case "HDesignLife":  //璁捐瀵垮懡
+                        value = isNaN(value) ? 0 : value;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HDesignLife: value,                          //璁捐瀵垮懡
+                            HLeaveLife: value - HUseLife,           //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HLeaveLife":  //鍓╀綑瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+                        obj.update({
+                            HLeaveLife: HDesignLife - HUseLife,   //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HUseLife":    //浣跨敤瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        value = isNaN(value) ? 0 : value;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HQty":        //瀹炲彂鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        debugger
+                        //if (HQty_Temp > HQtyMust_Temp) {
+                        //    layer.msg("瀹炴敹鏁伴噺鐨勫�间笉寰楀ぇ浜庡簲鏀舵暟閲�!")
+                        //    tableCache[index].HQty = HQtyMust_Temp == 0 ? 0 : 1;
+                        //}
+                        tableCache[index].HMoney = HPrice * tableCache[index].HQty;
+                        table.reload('mainTable', {
+                            data: tableCache
+                        })
+                        break;
+                    case "HPrice":      //鍗曚环
+                        value = isNaN(value) ? 0 : value;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HMoney":     //閲戦
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    default:
+                }
+            });
+
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    琛ㄥご
+        function GetHSupNameValue(obj)      //寰�鏉ュ崟浣嶏紙渚涘簲鍟嗭級
+        {
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        function GetHCusNameValue(obj)      //寰�鏉ュ崟浣嶏紙瀹㈡埛锛�
+        {
+            $("#HSupName").val(obj[0].瀹㈡埛鍚嶇О);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue1(obj)    //寰�鏉ュ崟浣嶏紙閮ㄩ棬锛�
+        {
+            $("#HSupName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue2(obj)     //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function GetHWHValue(obj)           //杩斿洖浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHNumber").val(obj[0].浠撳簱浠ｇ爜);
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHEmpValue(obj)          //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        function GetHManagerValue(obj)      //杩斿洖璐熻矗浜�
+        {
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj)   //杩斿洖楠屾敹鍛�
+        {
+            $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj)       //杩斿洖淇濈鍛�
+        {
+            $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetMouldInRequestBillValue(obj) { //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+            var objData = {};
+            objData.data = obj;
+            GetSourceBillList(objData);
+        }
+
+        //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    鍒楄〃
+        function GetMouldFileValue(obj)    //杩斿洖鍣ㄥ叿
+        {
+            OptionData = obj[0];
+        }
+        function GetUnitValue(obj)          //杩斿洖璁￠噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
+        function GetGyWarehouse(obj)       //杩斿洖浠撳簱
+        {
+            OptionData = obj[0];
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            var Result = true;
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i <= sSubStr.length - 1; i++) {
+                    if (sSubStr[i].HMaterID == "0") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HWHID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HQty == "0") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    ////鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    //if (parseFloat(sSubStr[i].HQty) == 0) {
+                    //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炴敹鏁伴噺涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return Result = false;
+                    //}
+                }
+            }
+            else {
+                return Result;
+            }
+            return Result;
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index 5072372..0307414 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -1,33 +1,32 @@
 锘�<!DOCTYPE html>
 <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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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>
+    <!--寮曠敤layui js鏂囦欢-->
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/common.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
-    <script src="../../../layuiadmin/HideButton_New.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">
@@ -41,121 +40,107 @@
                                         <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;">
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
-                                            style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
-                                            style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" 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">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                     </div>
                                 </div>
-
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
-                                    lay-filter="btnSearch" id="btnSearch">
+                                <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>
+                                <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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select name="HStatus" lay-filter="HStatus" style="width:190px;"
+                                                    class="ForFilteringSchemes" id="HStatus">
+                                                <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                                <option value="0">鏈鏍�</option>
+                                                <option value="1">宸插鏍�</option>
+                                                <option value="2">宸插叧闂�</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="HOrgID" id="HOrgID" lay-verify="HOrgID"
-                                                class="ForFilteringSchemes">
+                                            <select name="HStockOrgID" id="HStockOrgID" lay-verify="HStockOrgID"
+                                                    class="ForFilteringSchemes">
                                                 <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                             </select>
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
+                                    <div class="layui-row" style="margin-top:5px">
                                         <div class="layui-inline">
-                                            <span>鍏朵粬鏉′欢></span>
+                                            <div class="layui-inline">
+                                                <span>鍏朵粬鏉′欢></span>
+                                            </div>
                                         </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="HDept"
-                                                id="HDept" style="width:190px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+                                                       id="HDept" style="width:190px;">
+                                            </div>
                                         </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="HMaterNumber" id="HMaterNumber" style="width:190px;">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HModelNumber" id="HModelNumber" style="width:190px;">
+                                            </div>
                                         </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="HModelNumber" id="HModelNumber" 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">寰�鏉ュ崟浣�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSupName"
-                                                id="HSupName" style="width:190px;">
+                                        <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;">
+                                            </div>
                                         </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="ColName" id="ColName" lay-filter="ColName"
-                                                    style="width:190px;" class="ForFilteringSchemes">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator" id="Comparator" lay-filter="Comparator"
-                                                style="width:190px;" class="ForFilteringSchemes">
+                                            <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="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -163,33 +148,26 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent" id="ColContent">
+                                            <input type="text" class="layui-input ForFilteringSchemes" 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;" class="ForFilteringSchemes">
+                                                <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;" class="ForFilteringSchemes">
+                                            <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="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -197,33 +175,26 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent1" id="ColContent1">
+                                            <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"
-                                                    style="width:190px;" class="ForFilteringSchemes">
+                                                <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;" class="ForFilteringSchemes">
+                                            <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="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -231,34 +202,36 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent2" id="ColContent2">
+                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
-                        <div id="page"></div>
+                        <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Copy" id="Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AuditAll" id="btn_AuditAll"><i class="layui-icon layui-icon-radio"></i>瀹℃牳(鎵归噺)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAuditAll" id="btn_DeAuditAll"><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-circle"></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-circle"></i>鍙嶄綔搴�</button>
                                 <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-audit" id="audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -266,17 +239,13 @@
             </div>
         </div>
     </div>
-
-    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙ｆā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -285,67 +254,40 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
-                , util = layui.util
                 , soulTable = layui.soulTable
-
-
-            var Organization = sessionStorage["Organization"];
-
-            var option = [];
-
-            //鏌ヨ鏉′欢
-            var sWhere = "";
-            var optionPage = [];
-
-            var HModName = "Sc_MouldProdBackBillList"
+            var HModName = "Sc_MouldProdBackBillList";
             var HBillType = "3803";
-            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            var Type = "3803";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockOrgID = sessionStorage["OrganizationID"]   //缁勭粐ID
+            var sWhere = "";
             var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
             var page = 1;//鍒嗛〉鏁版嵁
             var size = 50;
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = [];
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "鍣ㄥ叿棰嗙敤閫�搴撳崟";
+            window.HModuleName = "鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
             window.HInterID_Choose = 0;
-            //#endregion
-
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "3803";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion
-
-            //鍒濆鍖栫晫闈�
-            set_ClearBill();
 
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-                optionPage.curr = 1;
-                get_FastQuery(table, option);
-
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                optionPage.curr = 1;
-                get_FastQuery(table, option);
-
-            });
-            //#endregion
+            //#region 鍥炶溅鏌ヨ
 
             //杈撳叆妗嗗洖杞︽柟娉�
             $('input').on('keydown', function (event) {
@@ -354,7 +296,29 @@
                 }
             });
 
-            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var HInterID = data.hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html?OperationType=2&HInterID=' + HInterID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            });
+
+            //#endregion
+
+            //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -362,8 +326,8 @@
                     $('#HBeginDate').prop('disabled', true);
                     $('#HEndDate').prop('disabled', true);
 
-                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
 
                     //鎵ц鏌ヨ鏂规硶
                     get_FastQuery();
@@ -373,10 +337,17 @@
                 }
             });
 
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
             function set_ClearBill() {
-                // 鍒濆鍖栫粍缁�
+                //鍒濆鍖栫粍缁�
                 Organ();
                 //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
                 setSelect_HInitTimeCycle();
@@ -390,17 +361,55 @@
                     $('#HEndDate').prop('disabled', false);
                 }
 
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鍒濆鍖栭〉澶у皬
-                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
-                //鏌ヨ
-                //get_Display(sWhere);
-                get_FastQuery(table, option);
-                //榛樿鏂规
-                get_DefaultModule()
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#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>';
+                            }
+                            $("#HStockOrgID").append(Organization);
+                            $("#HStockOrgID").val(HStockOrgID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
             }
             //#endregion
 
@@ -409,91 +418,21 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    //, page: true
+                    , page: false
                     , totalRow: true
+                    , height: 'full-50'
                     , cellMinWidth: 90
-                    //, limits: [50, 500, 5000, 20000]
                     , limit: 50
+
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true }
-                        , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
-                        , { field: 'HSupTypeID', title: 'HSupTypeID', width: 200, hide: true, sort: true }
-                        , { field: '寰�鏉ョ被鍨嬪悕绉�', title: '寰�鏉ョ被鍨�', width: 200, sort: true }
-                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true, sort: true }
-                        , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 200, sort: true }
-                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
-                        , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
-                        , { field: '浠撳簱', title: '浠撳簱', width: 125, sort: true }
-                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
-                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true }
-                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true }
-                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
-                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true }
-                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true }
-                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
-                        , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115, sort: true }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
-                        , { field: '鎽樿', title: '鎽樿', width: 125, sort: true }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125, sort: true }
-                        //, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 , sort: true}
-                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
-                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
-                        , { field: '妯″叿浠ｇ爜', title: '鍣ㄥ叿浠ｇ爜', width: 125, sort: true }
-                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125, sort: true }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125, sort: true }
-                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true, sort: true }
-                        , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125, sort: true }
-                        //, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 , sort: true}
-                        //, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 , sort: true}
-                        , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true, sort: true }
-                        , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 125, sort: true }
-                        , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125, sort: true }
-                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
-                        , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 125, sort: true }
-                        , { field: '浠撲綅', title: '浠撲綅', width: 125, sort: true }
-                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
-                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
-                        , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
-                        , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true }
-                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125, sort: true }
-                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true }
-                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
-                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125, sort: true }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
-                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125, sort: true }
-                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, hide: true, sort: true }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, hide: true, sort: true }
-                    ]]
                 };
-
-
                 optionPage = {
                     elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
                     count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
                     limit: 50,
-                    limits: [50, 500, 5000, 50000],
+                    limits: [50, 500, 1000, 2000],
                     layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                     jump: function (obj, first) {
                         //console.log(obj)
@@ -503,6 +442,7 @@
 
                         //棣栨涓嶆墽琛�
                         if (!first) {
+                            //do something
                             page = obj.curr;
                             size = obj.limit;
                             get_FastQuery();
@@ -512,120 +452,6 @@
                 laypage.render(optionPage);
             }
             //#endregion
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                var ModRightNameSelect = "Sc_MouldProdBackBillList";
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Sc_MouldProdBackBill/GetMouldProdBackBill',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //#region 鏌ヨ(涓昏〃)-鍒嗛〉
-            function get_DisplayPage(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Sc_MouldProdBackBill/list_byPage',
-                    type: "GET",
-                    async: false,
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
-                    success: function (data1) {
-                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        if (data1.code == "1") {
-                            var data = [];
-                            var col = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
-                                var patrn = new RegExp(/^h/i);
-                                if (patrn.test(data1.list[key].ColmCols)) {
-                                    titleData[key] = data1.list[key].ColmCols;
-                                }
-                            }
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
-                            for (var i = 0; i < data.length; i++) {
-                                if ($.inArray(data[i].name, titleData) > -1) {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        //int
-                                        case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                            break;
-                                        case 'long':
-                                        case 'Int32':
-                                        case 'Int64':
-                                        case 'double':
-                                        case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
-                                            break;
-                                        default:
-                                            if (data[i].name === '鍗曟嵁鍙�') {
-                                                col.push({
-                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
-                                                    templet: function (d) {
-                                                        return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
-                                                    }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
-                                                });
-                                            } else {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                            }
-                                    }
-                                }
-                            }
-                            option.cols = [col];
-                            option.data = data1.data;
-                            //鍒楄缃�
-                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
-
-                            ins = table.render(option);
-
-                            laypage.render(optionPage);
-
-                            if ($("#ColName option").length < 1) {
-                                ColFilter();
-                                get_DefaultModule();
-                            }
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
-                            layer.close(ajaxLoad);
-                        } else {
-                            option.data = [];
-                            ins = table.render(option);
-                            laypage.render(optionPage);
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-            //#endregion
-
 
             //#region 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
@@ -648,304 +474,487 @@
             })
             //#endregion
 
-            //#region 鎺掑簭鍚庨�夋嫨
-            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                table.reload('mainTable', {
-                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
-                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
-                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
-                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                            newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                            dataCol = data1.data[0].HGridString.split(',');
+                            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                            if (dataCol.length == option.cols[0].length - 1) {
+                                //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                                for (var j = 0; j < option.cols[0].length - 1; j++) {
+                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                        var dataCols = dataCol[j].split('|');
+                                        //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                            //闅愯棌鍒�
+                                            if (dataCols[1] == 1) {
+                                                option.cols[0][i + 1]["hide"] = true;
+                                            }
+                                            //璁剧疆鍒楀
+                                            if (dataCols[3] > 0) {
+                                                option.cols[0][i + 1]["width"] = dataCols[3];
+                                            }
+                                            //璁剧疆鍐呭瀛椾綋澶у皬
+                                            if (data1.data[0].HFontSize != 0) {
+                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                            } else {
+                                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                                            }
+                                            //鏄剧ず鍒�
+                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                                option.cols[0][i + 1]["hide"] = false;
+                                            }
+                                            //缁熻鍒�
+                                            if (dataCols[6] == 1) {
+                                                option.cols[0][i + 1]["totalRow"] = true;
+                                            }
+                                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                            switch (dataCols[2]) {
+                                                case "L":
+                                                    option.cols[0][i + 1]["align"] = "left";
+                                                    break;
+                                                case "M":
+                                                    option.cols[0][i + 1]["align"] = "center";
+                                                    break;
+                                                case "R":
+                                                    option.cols[0][i + 1]["align"] = "right";
+                                                    break;
+                                            }
+                                            //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                            if (dataCols[4] != null && dataCols[4] != "") {
+                                                option.cols[0][i + 1]["title"] = dataCols[4];
+                                            }
+                                            newCols[0].push(option.cols[0][i + 1]);
+                                        }
+                                    }
+                                }
+                                //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                                if (dataCol.length == newCols[0].length - 1) {
+                                    option.cols = newCols;
+                                    //鍙栨秷鍐荤粨鍒�
+                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                        if (option.cols[0][i]["fixed"] != null) {
+                                            option.cols[0][i]["fixed"] = null;
+                                        }
+                                        else {
+                                            break;
+                                        }
+                                    }
+                                    //鍐荤粨鍒�
+                                    if (data1.data[0].HFixCols != 0) {
+                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                                data1.data[0].HFixCols += 1;
+                                            }
+                                            option.cols[0][i + 1]["fixed"] = "left";
+                                        }
+                                    }
+                                }
+                            }
+                            table.render(option);
+                            ins = table.render(option);
+                        } else {
+                            table.render(option);
+                            ins = table.render(option);
+                        }
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-                option.data = layui.table.cache["mainTable"];
-                table.render(option);
-                //鍒锋柊鎸夐挳鏄剧ず
-                Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-            });
+                })
+            }
             //#endregion
 
-            //澶村伐鍏锋爮浜嬩欢
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板' + HPageTitle,
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
-                        break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫' + HPageTitle
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MouldProdBackBill/DeltetMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                $("#btnSearch").trigger('click');
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                    case 'btn-view': get_ViewReport();
-                        break;
-                    // 鎵撳嵃
-                    case 'btn-print': get_PrintReport();
-                        break;
-                    //瀹℃牳
-                    case 'btn-audit': get_Audit();
-                        break;
-                    //鍙嶅鏍�
-                    case 'btn-Faudit': get_FAudit();
-                        break;
-                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(0);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(1);
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn':
-                        get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
                         break;
                     // 澶嶅埗鎸夐挳
-                    case 'btn-Copy': set_AddCopy();
+                    case 'btn_Copy': set_AddCopy();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //鎵撳嵃
+                    case 'btn-print': get_PrintReport();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //瀹℃牳鎸夐挳 鎵归噺     锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_AuditAll': set_CheckBillAll(1);
+                        break;
+                    //鍙嶅鏍告寜閽� 鎵归噺
+                    case 'btn_DeAuditAll': set_CheckBillAll(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
                         break;
                     //瀵煎嚭鎸夐挳
                     case 'btn_Export': btn_Export();
                         break;
                     //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
                         break;
                 };
             });
+            //#endregion
 
-            // 琛ㄦ牸鑷畾涔変簨浠�
-            table.on('tool(mainTable)', function (obj) {
-                let data = obj.data;
-                switch (obj.event) {
-                    case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
-                }
-            })
-            //棰勮
-            function get_ViewReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯＄増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
-                        , resize: false
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
-                }
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html?OperationType=1&HInterID=0'
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
             }
+            //#endregion
 
-            //鎵撳嵃
-            function get_PrintReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯＄増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdBackBill', 'yes']
-                        , resize: false
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
-                }
-            }
-
-            //瀹℃牳
-            function get_Audit() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
-                }
-            }
-
-            //鍙嶅鏍�
-            function get_FAudit() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdBackBill/AuditMouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    var index = layer.getFrameIndex(window.name);
-                                    //鍏抽棴褰撳墠frame
-                                    layer.close(index);
-                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                    $("#btnSearch").trigger('click');
-                                });
-
-                            } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
-                }
-            }
-
-            //澶嶅埗鍗曟嵁
+            //#region 澶嶅埗
             function set_AddCopy() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var hID = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    var HInterID = data[0].hmainid.toString();
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
-                        , title: '澶嶅埗' + HPageTitle
+                        , title: HPageTitle + '- 澶嶅埗'
                         , closeBtn: 1
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html?OperationType=3&linterid=' + HInterID
                         , resize: false,
                         end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
+                            get_FastQuery(table, option);
                         }
                         , cancel: function () {
                             //$(".layui-btn").removeClass("layui-btn-disabled");
                         }
                     })
-
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
                 }
             }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillEdit.html?OperationType=2&HInterID=' + HInterID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region 鎵撳嵃鍔熻兘
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (checkStatus.data.length === 0) {
+                    return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+                }
+                else {
+                    var hmainid = [];
+                    for (var i = 0; i < checkStatus.data.length; i++) {
+                        hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+                    }
+
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯＄増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HMouldProdBackBillList', 'yes']
+                        , resize: false
+                    })
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region  鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBillAll(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString =uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdBackBillController/CheckAll",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "ids": queryString, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                   layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
+                }
+            }
+            //#endregion
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
+                }
+            }
+            //#endregion
 
             //#region 瀵煎嚭Execel
             function btn_Export() {
@@ -962,87 +971,110 @@
 
                 table.exportFile(ins.config.id, option.data, "xls");
             }
-
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
-            function set_CloseBill(num) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Sc_MouldProdBackBill/CloseSc_MouldProdBackBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        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 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>';
-                            }
-                            $("#HOrgID").append(Organization);
-                            $("#HOrgID").val(sessionStorage["OrganizationID"])
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+                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_New.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 get_FastQuery(table, option) {
-                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
-                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
-                var HDept = $("#HDept").val();       //閮ㄩ棬淇℃伅
-                var HMaterNumber = $("#HMaterNumber").val();   //鐗╂枡浠ｇ爜    
-                var HModelNumber = $("#HModelNumber").val();    //鍣ㄥ叿浠ｇ爜
-                var HWhName = $("#HWhName").val();  //浠撳簱鍚嶇О
-                var HSupName = $("#HSupName").val();    //寰�鏉ュ崟浣�
-                var ColName = $("#ColName").val();//澶嶉�夋
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HInitTimeCycle").val("29");
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HStatus").val("-1")
+                $("#HStockOrgID").val(HStockOrgID)
+                $("#HDept").val("");
+                $("#HModelNumber").val("");
+                $("#HSupName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();    //鐘舵��
+                var HBeginDate = $("#HBeginDate").val();            //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();                //缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();                  //鍗曟嵁鍙�
+                var HDept = $("#HDept").val();                      //閮ㄩ棬淇℃伅
+                var HModelNumber = $("#HModelNumber").val();        //鍣ㄥ叿浠ｇ爜
+                var HSupName = $("#HSupName").val();                //寰�鏉ュ崟浣�
+                var ColName = $("#ColName").val();                  //澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var ColName1 = $("#ColName1").val();                //澶嶉�夋
                 var Comparator1 = $("#Comparator1").val()
                 var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var ColName2 = $("#ColName2").val();                //澶嶉�夋
                 var Comparator2 = $("#Comparator2").val()
                 var ColContent2 = $("#ColContent2").val();
+                HStockOrgID = $('#HStockOrgID').val()
 
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
@@ -1102,19 +1134,33 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            com2 = "" + Comparator + "'" + ColContent + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
                 }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
+
+                    }
+                }
                 if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
                 }
                 if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
-                }
-                if (HStockOrgName) {
-                    sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -1122,81 +1168,109 @@
                 if (HDept) {
                     sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
                 }
-                if (HMaterNumber) {
-                    sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
-                }
                 if (HModelNumber) {
-                    sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
-                }
-                if (HWhName) {
-                    sWhere += " and 浠撳簱 like '%" + HWhName + "%'";
+                    sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + HModelNumber + "%'";
                 }
                 if (HSupName) {
                     sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
                 }
-                //get_Display(sWhere);
+                sWhere += " and HSTOCKORGID=" + HStockOrgID;
                 get_DisplayPage(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
+
             //#endregion
-            //#region 閲嶇疆杩囨护鏉′欢
-            function set_ClearQuery() {
-                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#HDept").val("");
-                $("#HMaterNumber").val("");
-                $("#HModelNumber").val("");
-                $("#HWhName").val("");
-                $("#HSupName").val("");
-                $("#HStockOrgName").val(""); $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                form.render('select');
-                sWhere = "";
-                get_Display(sWhere);
+
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldProdBackBillController/page',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size, "Type": Type },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (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 (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 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            option.totalRow = true;
+                            laypage.render(optionPage);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            //option.data = [[]]
+                            //table.render(option);
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
             }
             //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                get_Display(sWhere);
-            }
-            //#endregion
-
-            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
-            function setSelect_HInitTimeCycle() {
-                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
-                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
-
-                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
-                for (var i = 0; i < valueList.length; i++) {
-                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
-                }
-
-                $("#HInitTimeCycle").empty();
-                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
-                form.render('select');
-
-                $("#HInitTimeCycle").val("29");
-            }
-            //#endregion
-
 
             //#region 鍒楁槑鏄剧ず涓嬫媺妗�
             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>';
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                     }
                 }
                 $("#ColName").empty();
@@ -1208,14 +1282,8 @@
                 form.render('select');
             }
             //#endregion
+            //#endregion
 
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
@@ -1253,8 +1321,8 @@
                                 $('#HBeginDate').prop('disabled', true);
                                 $('#HEndDate').prop('disabled', true);
 
-                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
 
 
                                 //鎵ц鏌ヨ鏂规硶
@@ -1264,16 +1332,16 @@
                                 $('#HEndDate').prop('disabled', false);
                             }
 
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            //鏌ヨ
+                            get_FastQuery();
                             form.render("select");
                         } else {
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery();
+                            form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1441,31 +1509,10 @@
             }
 
             //#endregion
-            function onHBillNumberClickHandler(data) {
-                var hID = new String(data.hmainid)
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '缂栬緫' + HPageTitle
-                    , closeBtn: 1
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                    , resize: false,
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    }
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            }
+
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
         function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
         {
@@ -1504,10 +1551,7 @@
             });
         }
         //#endregion
-
-
     </script>
 
 </body>
-
-</html>
\ No newline at end of file
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillEdit.html"
new file mode 100644
index 0000000..87b2f2f
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillEdit.html"
@@ -0,0 +1,2415 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鍣ㄥ叿璋冩嫧鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--寮曠敤layui js鏂囦欢-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.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 class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Save" id="btn_Save">淇濆瓨</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Audit" id="btn_Audit">瀹℃牳</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_print" id="btn_print">鎵撳嵃</button>
+                            <button class="layui-btn layui-btn-normal layui-btn-radius" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-Bill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鍣ㄥ叿璋冩嫧鍗�</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�<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="HRedBlueFlag" id="HRedBlueFlag" value="false">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block">
+                                                <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="width:190px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璋冨叆缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+                                                <select name="HStockInOrgID" id="HStockInOrgID" lay-filter="HStockInOrgID" lay-verify="HStockInOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寰�鏉ョ被鍨�</label>
+                                            <div class="layui-input-inline">
+                                                <select name="HSupTypeID" id="HSupTypeID" lay-filter="HSupTypeID" class="layui-input" value="" style="float:left;width:150px">
+                                                    <option value="1">渚涘簲鍟�</option>
+                                                    <option value="2">瀹㈡埛</option>
+                                                    <option value="3">杞﹂棿閮ㄩ棬</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">寰�鏉ュ崟浣�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <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-inline">
+                                            <label class="layui-form-label">璋冨嚭缁勭粐<label style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="margin-left: 110px; width: 501px;">
+                                                <select name="HStockOutOrgID" id="HStockOutOrgID" lay-filter="HStockOutOrgID" lay-verify="HStockOutOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">閮ㄩ棬</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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-inline">
+                                            <label class="layui-form-label">璋冨叆浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWHNumber" id="HWHNumber" class="layui-input" value="" 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-inline">
+                                            <label class="layui-form-label">璋冨嚭浠撳簱</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSCWHName" id="HSCWHName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HSCWHNumber" id="HSCWHNumber" class="layui-input" value="" 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-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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 class="layui-inline">
+                                            <label class="layui-form-label">璐熻矗浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HManagerName" id="HManagerName" readonly class="layui-input" value="" style="background-color: #efefef4d; 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-inline">
+                                            <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSecManagerName" id="HSecManagerName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" 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 style="color:red"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
+                                                <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟绫诲瀷</label>
+                                            <div class="layui-input-inline">
+                                                <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+                                                    <!--鍔ㄦ�佽幏鍙栨簮鍗�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">婧愬崟鍗曞彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">鎽樿</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 1135px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="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: 1135px;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="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>
+
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鏄庣粏淇℃伅</li>
+                            <li>姹囨�讳俊鎭�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="SumTable" lay-filter="SumTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddLine" id="btn_AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_InsertLine" id="btn_InsertLine"><i class="layui-icon layui-icon-form"></i>鎻掑叆涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_CopyLine" id="btn_CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Up" id="btn_Up"><i class="layui-icon layui-icon-form"></i>涓婄Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Under" id="btn_Under"><i class="layui-icon layui-icon-form"></i>涓嬬Щ</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="HStockOrgID" id="HStockOrgID">
+                </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>
+        var OptionData = [];
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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 HModName = "Sc_MouldProdMoveBillEdit";
+            var HBillType = "3814";
+            var HInterID = $('#HInterID').val()
+            var HMaker = sessionStorage["HUserName"]
+            var HStockInOrgID = sessionStorage["OrganizationID"]    //璋冨叆缁勭粐ID
+            var HStockOutOrgID = sessionStorage["OrganizationID"]   //璋冨嚭缁勭粐ID
+            var OperationType = 1       //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+            var closeType = 2;          //鍏抽棴绫诲瀷
+            var option = [];
+            var Sumoption = [];
+            var titleData = [];                 //涓嶉渶瑕佹樉绀虹殑瀛楁
+            var params = get_UrlVars();         //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            OperationType = params[params[0]] == null ? 1 : params[params[0]];          //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
+            HInterID = params[params[1]] == null ? 0 : params[params[1]];               //鍗曟嵁鍐呯爜
+            var HSouceBillType = params[params[2]] == null ? "" : params[params[2]];    //婧愬崟绫诲瀷
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? $("h1").html() : get_PageTitle(HBillType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //鍒濆鍖栧瓙琛ㄥ苟鍒楄缃�
+            set_InitGrid();
+            DisPlay_HideColumn();
+            set_SumGrid();
+            DisPlay_HideColumn_Sum();
+
+            //#region   鑾峰彇缁勭粐
+
+            //鑾峰彇缁勭粐
+            Organ();
+
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    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>';
+                            }
+                            $("#HStockInOrgID").append(Organization);
+                            $("#HStockInOrgID").val(HStockInOrgID)
+                            $("#HStockOutOrgID").append(Organization);
+                            $("#HStockOutOrgID").val(HStockOutOrgID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                })
+            }
+            //#endregion
+
+            //#region   鑾峰彇婧愬崟绫诲瀷
+
+            //鍔ㄦ�佽幏鍙栨簮鍗曠被鍨�
+            SourceBillType();
+
+            function SourceBillType() {
+                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>';
+                            }
+                            $("#BillType").append(HSourceBillTypes);
+                            form.render('select');
+                        }
+                    }
+                })
+            }
+            //#endregion
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == undefined || OperationType == 1) {   //鏂板
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                OperationType = 1;
+                closeType = 2;
+            }
+            else if (OperationType == 2) {  //缂栬緫
+                $("#HInterID").val(HInterID);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(HInterID);
+                closeType = 1;
+            }
+            else if (OperationType == 3) {  //澶嶅埗
+                //鏍规嵁鍐呯爜锛岃幏鍙栦俊鎭苟鍐欏叆鐣岄潰
+                RoadBillMain(HInterID);
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂淬�佸鏍镐汉銆佸鏍告棩鏈熴�佸叧闂汉銆佸叧闂棩鏈熴�佷慨鏀逛汉銆佷慨鏀规棩鏈熴�佷綔搴熶汉銆佷綔搴熸棩鏈�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HChecker").val("");
+                $("#HCheckDate").val("");
+                $("#HCloseMan").val("");
+                $("#HCloseDate").val("");
+                $("#HUpDater").val("");
+                $("#HUpDateDate").val("");
+                $("#HDeleteMan").val("");
+                $("#HDeleteDate").val("");
+                $('#btn_Save').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳鎭㈠姝ｅ父鐘舵��
+                OperationType = 1;
+                closeType = 1;
+            }
+            else if (OperationType == 4) {  //涓嬫帹
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                //鍒濆鍖栨棩鏈熴�佸垱寤轰汉銆佸垱寤烘椂闂�
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(HMaker);
+                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+                //璁剧疆婧愬崟绫诲瀷
+                $("#BillType").val(HSouceBillType);
+                //鑾峰彇婧愬崟鏁版嵁
+                var data = getUrlVars_JSON().data;
+                var dataArray = [];
+                for (var i = 0; i < data.length; i++) {
+                    var temp = GetSourceBillList(data[i].hmainid, data[i].hsubid, data[i].HBillType);
+                    if (temp != "none") {
+                        dataArray.push(temp);
+                    } else {
+                        var err = "鏈煡璇㈠埌鍗曟嵁鍙笅鎺ㄦ暟鎹紝璇峰埛鏂板崟鎹垪琛ㄥ悗閲嶆柊閫夋嫨鍗曟嵁涓嬫帹锛�";
+                        layer.alert(err, { icon: 5 });
+                        return;
+                    }
+                }
+                setInitBySourceBill(dataArray);
+                OperationType = 1;
+                closeType = 1;
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#region 鏂板妯″紡  鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/WEBSController/GetMaxBillNo_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HBillType": HBillType },
+                    success: function (d) {
+                        if (d.count == 1) {
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                        }
+                        else {
+                            $("#HBillNo").val("");
+                            layer.msg(d.Message, { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
+                });
+            }
+            //#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 RoadBillMain(HInterID) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HInterID, "HMaker": HMaker },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[0];
+                            if (data[0].瀹℃牳浜� != "") {
+                                $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            if (data[0].HSourceInterID != "0") {
+                                $("#HStockInOrgID").attr("disabled", "disabled");
+                                $("#HStockOutOrgID").attr("disabled", "disabled");
+                                form.render('select');
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data[0].鍗曟嵁鍙�
+                                , "HDate": formatDate(data[0].鏃ユ湡)
+                                , "HSupTypeID": data[0].HSupTypeID
+                                , "HSupID": data[0].HSupID
+                                , "HSupName": data[0].寰�鏉ュ崟浣�
+                                , "HDeptID": data[0].HDeptID
+                                , "HDeptName": data[0].閮ㄩ棬
+                                , "HWHID": data[0].HMainWHID
+                                , "HWHName": data[0].璋冨叆浠撳簱
+                                , "HSCWHID": data[0].HMainSCWHID
+                                , "HSCWHName": data[0].璋冨嚭浠撳簱
+                                , "HEmpID": data[0].HEmpID
+                                , "HEmpName": data[0].涓氬姟鍛�
+                                , "HManagerID": data[0].HManagerID
+                                , "HManagerName": data[0].璐熻矗浜�
+                                , "HSecManagerID": data[0].HSecManagerID
+                                , "HSecManagerName": data[0].楠屾敹鍛�
+                                , "HKeeperID": data[0].HKeeperID
+                                , "HKeeperName": data[0].淇濈鍛�
+                                , "HExplanation": data[0].鎽樿
+                                , "HRemark": data[0].琛ㄥご澶囨敞
+                                , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+                                , "HStockInOrgID": data[0].HStockInOrgID
+                                , "HStockOutOrgID": data[0].HStockOutOrgID
+                                , "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")
+                            });
+                            HStockInOrgID = data[0].HStockInOrgID == null ? 0 : data[0].HStockInOrgID;
+                            HStockOutOrgID = data[0].HStockOutOrgID == null ? 0 : data[0].HStockOutOrgID;
+
+                            //瀛愯〃  璧嬪��
+                            option.data = result.data[0];
+                            table.render(option);
+                            Sumoption.data = result.data[1];
+                            table.render(Sumoption);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏄庣粏淇℃伅鍒濆鍖�
+            function set_InitGrid() {
+                var topScroll = 0;
+                let disabled_color = '#e2e2e2';
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterNumber', title: '鍣ㄥ叿浠ｇ爜', width: 100, edit: 'text', event: "HMaterNumber" }     //F7
+                        , { field: 'HMaterName', title: '鍣ㄥ叿鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, edit: 'text', event: "HUnitNumber" }       //F7
+                        , { field: 'HUnitName', title: '璁￠噺鍗曚綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HBatchNo', title: '鎵规', width: 100, hide: true, edit: 'text' }
+                        , { field: 'HQty', title: '瀹炲彂鏁伴噺', width: 100, edit: 'text', totalRow: true }
+                        , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHID', title: 'HWHID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHNumber', title: '璋冨叆浠撳簱浠ｇ爜', width: 100, edit: 'text', event: "HWHNumber" }   //F7
+                        , { field: 'HWHName', title: '璋冨叆浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPID', title: 'HSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPNumber', title: '璋冨叆浠撲綅浠ｇ爜', width: 100, edit: 'text', event: "HSPNumber" } //F7
+                        , { field: 'HSPName', title: '璋冨叆浠撲綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCWHNumber', title: '璋冨嚭浠撳簱浠ｇ爜', width: 100, edit: 'text', event: "HSCWHNumber" }   //F7
+                        , { field: 'HSCWHName', title: '璋冨嚭浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCSPID', title: 'HSCSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSCSPNumber', title: '璋冨嚭浠撲綅浠ｇ爜', width: 100, edit: 'text', event: "HSCSPNumber" }         //F7
+                        , { field: 'HSCSPName', title: '璋冨嚭浠撲綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceInterID', title: 'HSourceInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceBillType', title: 'HSourceBillType', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HRelationQty', title: '鍏宠仈鏁伴噺', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HRelationMoney', title: '鍏宠仈閲戦', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSecUnitRate', title: '鎹㈢畻鐜�', width: 100, hide: true, edit: 'text' }
+                        , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HMoney', title: '閲戦', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HDesignLife', title: '璁捐瀵垮懡', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', width: 100, hide: true, edit: 'text', totalRow: true }
+                        , { field: 'HPOOrderInterID', title: 'HPOOrderInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HPOOrderEntryID', title: 'HPOOrderEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderInterID', title: 'HSeOrderInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderEntryID', title: 'HSeOrderEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOWNERID', title: 'HOWNERID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HOWNERTYPEID', title: 'HOWNERTYPEID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HUseLife', title: 'HUseLife', width: 100, hide: true, style: 'background:  ' + disabled_color, totalRow: true }
+                        , { field: 'HUseLifeQty', title: 'HUseLifeQty', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNewLifeQty', title: 'HNewLifeQty', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HQtyRel', title: 'HQtyRel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNewModel', title: 'HNewModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HWallThickness', title: 'HWallThickness', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HHardness', title: 'HHardness', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HLastProdModel', title: 'HLastProdModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HDiameter', title: 'HDiameter', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HBackFlag', title: 'HBackFlag', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HBarCode', title: 'HBarCode', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HMouldType', title: 'HMouldType', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HInitModel', title: 'HInitModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HInitDesignLife', title: 'HInitDesignLife', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HLifeUnitID', title: 'HLifeUnitID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNowModel', title: 'HNowModel', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HNowLife', title: 'HNowLife', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HCorrespondentTypeID', title: 'HCorrespondentTypeID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HCorrespondentID', title: 'HCorrespondentID', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                }
+
+                var rowdata = [{
+                    "HMaterID": "0"
+                    , "HMaterNumber": ""
+                    , "HMaterName": ""
+                    , "HMaterModel": ""
+                    , "HUnitID": "0"
+                    , "HUnitNumber": ""
+                    , "HUnitName": ""
+                    , "HBatchNo": ""
+                    , "HQty": "0"
+                    , "HWHID": "0"
+                    , "HWHNumber": ""
+                    , "HWHName": ""
+                    , "HSPID": "0"
+                    , "HSPNumber": ""
+                    , "HSPName": ""
+                    , "HSCWHID": "0"
+                    , "HSCWHNumber": ""
+                    , "HSCWHName": ""
+                    , "HSCSPID": "0"
+                    , "HSCSPNumber": ""
+                    , "HSCSPName": ""
+                    , "HSourceInterID": "0"
+                    , "HSourceEntryID": "0"
+                    , "HSourceBillType": ""
+                    , "HSourceBillNo": ""
+                    , "HRelationQty": "0"
+                    , "HRelationMoney": "0"
+                    , "HRemark": ""
+                    , "HPropertyID": "0"
+                    , "HSecUnitID": "0"
+                    , "HSecUnitRate": "0"
+                    , "HQtyMust": "0"
+                    , "HPrice": "0"
+                    , "HMoney": "0"
+                    , "HDesignLife": "0"
+                    , "HLeaveLife": "0"
+                    , "HPOOrderInterID": "0"
+                    , "HPOOrderEntryID": "0"
+                    , "HPOOrderBillNo": ""
+                    , "HSeOrderInterID": "0"
+                    , "HSeOrderEntryID": "0"
+                    , "HSeOrderBillNo": ""
+                    , "HSTOCKORGID": HStockOutOrgID
+                    , "HOtherOrgID": HStockInOrgID
+                    , "HOWNERID": HStockOutOrgID
+                    , "HOWNERTYPEID": ""
+                    , "HUseLife": "0"
+                    , "HUseLifeQty": "0"
+                    , "HNewLifeQty": "0"
+                    , "HQtyRel": "0"
+                    , "HSPGroupID": "0"
+                    , "HNewModel": ""
+                    , "HWallThickness": ""
+                    , "HHardness": ""
+                    , "HLastProdModel": ""
+                    , "HDiameter": ""
+                    , "HBackFlag": ""
+                    , "HBarCode": ""
+                    , "HMouldType": "0"
+                    , "HInitModel": ""
+                    , "HInitDesignLife": "0"
+                    , "HLifeUnitID": "0"
+                    , "HNowModel": ""
+                    , "HNowLife": "0"
+                    , "HCorrespondentTypeID": "0"
+                    , "HCorrespondentID": "0"
+                }];
+
+                option.data = rowdata;
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 姹囨�讳俊鎭垵濮嬪寲
+            function set_SumGrid() {
+                let disabled_color = '#e2e2e2';
+                Sumoption = {
+                    elem: '#SumTable'
+                    , totalRow: true
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { field: 'HMaterNumber_S', title: '鐗╂枡浠ｇ爜', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterName_S', title: '鐗╂枡鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HMaterModel_S', title: '瑙勬牸鍨嬪彿', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HBatchNo_S', title: '鎵规', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HQty_S', title: '鏁伴噺', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHNumber_S', title: '璋冨嚭浠撳簱浠ｇ爜', width: 100, style: 'background:  ' + disabled_color }
+                        , { field: 'HWHName_S', title: '璋冨嚭浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
+                    ]]
+                }
+
+                var Sumrowdata = [{
+                    "HMaterNumber_S": ""
+                    , "HMaterName_S": ""
+                    , "HMaterModel_S": ""
+                    , "HBatchNo_S": ""
+                    , "HQty_S": ""
+                    , "HWHNumber_S": ""
+                    , "HWHName_S": ""
+                }];
+
+                Sumoption.data = Sumrowdata;
+                table.render(Sumoption);
+            }
+            //#endregion
+
+            //#region 涓嬫媺妗嗕簨浠堕�夋嫨瑙﹀彂
+            //寰�鏉ョ被鍨�
+            form.on('select(HSupTypeID)', function (data) {
+                $("#HSupID").val("");
+                $("#HSupName").val("");
+            });
+
+            //璋冨叆缁勭粐
+            form.on('select(HStockInOrgID)', function (data) {
+                if (HStockInOrgID != $('#HStockInOrgID').val()) {
+                    HStockInOrgID = $('#HStockInOrgID').val()
+                    $("#HWHID").val("0");
+                    $("#HWHName").val("");
+                    var data = table.cache["mainTable"];
+                    for (const row of data) {
+                        row.HOtherOrgID = HStockInOrgID;
+                        row.HWHID = 0;
+                        row.HWHNumber = "";
+                        row.HWHName = "";
+                        row.HSPID = 0;
+                        row.HSPNumber = "";
+                        row.HSPName = "";
+                    }
+                    option.data = data;
+                    table.render(option);
+                }
+            });
+
+            //璋冨嚭缁勭粐
+            form.on('select(HStockOutOrgID)', function (data) {
+                if (HStockOutOrgID != $('#HStockOutOrgID').val()) {
+                    HStockOutOrgID = $('#HStockOutOrgID').val()
+                    $("#HSCWHID").val("0");
+                    $("#HSCWHName").val("");
+                    var data = table.cache["mainTable"];
+                    for (const row of data) {
+                        row.HSTOCKORGID = HStockOutOrgID;
+                        row.HOWNERID = HStockOutOrgID;
+                        row.HSCWHID = 0;
+                        row.HSCWHNumber = "";
+                        row.HSCWHName = "";
+                        row.HSCSPID = 0;
+                        row.HSCSPNumber = "";
+                        row.HSCSPName = "";
+                    }
+                    option.data = data;
+                    table.render(option);
+                }
+            });
+
+            //#endregion
+
+            //#region 閫夋嫨寮圭獥浜嬩欢
+
+            //#region 閫夋嫨寰�鏉ュ崟浣嶆寜閽�
+            form.on('submit(HSupList)', function () {
+                if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
+                    return layer.msg('璇烽�夋嫨寰�鏉ョ被鍨�');
+                }
+                get_checkSup();
+            });
+
+            function getSupType() {
+                var type = $("#HSupTypeID").val();
+                console.log(type)
+                switch (type) {
+                    case '1':
+                        return "../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup";
+                        break;
+                    case '2':
+                        return "../../鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html";
+                        break;
+                    case '3':
+                        return "../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&Type=HDept1";
+                        break;
+                }
+            }
+
+            function get_checkSup() {
+                var url = getSupType();
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "寰�鏉ュ崟浣嶅垪琛�"     //鏍囬
+                    , 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 != 1) {
+                            return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉� == undefined ? (checkStatus.data[0].閮ㄩ棬鍚嶇О == undefined ? checkStatus.data[0].瀹㈡埛鍚嶇О : checkStatus.data[0].閮ㄩ棬鍚嶇О) : checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+
+            function get_checkDept() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "閮ㄩ棬鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&Type=HDept2', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨璋冨叆浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkWH();
+            });
+
+            function get_checkWH() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "浠撳簱鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWH&', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        $("#HWHNumber").val(checkStatus.data[0].浠撳簱浠ｇ爜);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { },
+                    end: function () {
+                        var data = table.cache["mainTable"];
+                        for (const row of data) {
+                            row.HWHID = $("#HWHID").val();
+                            row.HWHNumber = $("#HWHNumber").val();
+                            row.HWHName = $("#HWHName").val();
+                            row.HSPID = 0;
+                            row.HSPNumber = "";
+                            row.HSPName = "";
+                        }
+                        option.data = data;
+                        table.render(option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨璋冨嚭浠撳簱鎸夐挳
+            form.on('submit(HSCWHList)', function () {
+                get_checkSCWH();
+            });
+
+            function get_checkSCWH() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "浠撳簱鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HSCWH&', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HSCWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HSCWHID").val(checkStatus.data[0].HItemID);
+                        $("#HSCWHNumber").val(checkStatus.data[0].浠撳簱浠ｇ爜);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { },
+                    end: function () {
+                        var data = table.cache["mainTable"];
+                        for (const row of data) {
+                            row.HSCWHID = $("#HSCWHID").val();
+                            row.HSCWHNumber = $("#HSCWHNumber").val();
+                            row.HSCWHName = $("#HSCWHName").val();
+                            row.HSCSPID = 0;
+                            row.HSCSPNumber = "";
+                            row.HSCSPName = "";
+                        }
+                        option.data = data;
+                        table.render(option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+
+            function get_checkEmp() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨璐熻矗浜烘寜閽�
+            form.on('submit(HManagerList)', function () {
+                get_checkManger();
+            });
+
+            function get_checkManger() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹鍛樻寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+
+            function get_checkSecManager() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨淇濈鍛樻寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+
+            function get_checkKeeper() {
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: "鑱屽憳鍒楄〃"         //鏍囬
+                    , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                    , area: ["90%", "90%"]      //绐椾綋澶у皬
+                    , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', '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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨婧愬崟鎸夐挳
+            form.on('submit(HMainSource)', function () {
+                get_checkMainSource();
+            });
+
+            function get_checkMainSource() {
+                var url = "";
+                var HSourceTitle = "";
+                if ($("#BillType").val() == "3850") {
+                    url = "../../妯℃不鍏风鐞�/鍣ㄥ叿璋冩嫧鐢宠鍗�/Sc_MouldMoveStockRequestBillList.html?openType=2&HOrgID=" + HStockOutOrgID + "&Type=" + HBillType;
+                    HSourceTitle = "鍣ㄥ叿璋冩嫧鐢宠鍗�";
+                } else {
+                    return layer.msg('鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭紒');
+                }
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim"   //鍔犱笂杈规
+                    , title: HSourceTitle + '鍒楄〃'//鏍囬
+                    , 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 HSupTypeID_Temp = checkStatus.data[0]["HSupTypeID"];
+                        var HStockInOrgID_Temp = checkStatus.data[0]["HStockInOrgID"];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            if (checkStatus.data[i]["HSupTypeID"] != HSupTypeID_Temp) {
+                                var err = "鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒";
+                                layer.alert(err, { icon: 5 });
+                                return;
+                            }
+                            if (checkStatus.data[i]["HStockInOrgID"] != HStockInOrgID_Temp) {
+                                var err = "鎵�閫夊崟鎹搴旇皟鍏ョ粍缁囧繀椤讳竴鑷达紒";
+                                layer.alert(err, { icon: 5 });
+                                return;
+                            }
+                        }
+                        //鑾峰彇婧愬崟鏁版嵁
+                        var dataArray = [];
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            var temp = GetSourceBillList(checkStatus.data[i]["hmainid"], checkStatus.data[i]["hsubid"], checkStatus.data[i]["HBillType"]);
+                            if (temp != "none") {
+                                dataArray.push(temp);
+                            } else {
+                                var err = "鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�";
+                                return;
+                            }
+                        }
+                        setInitBySourceBill(dataArray);
+                        layer.close(index); //鍏抽棴寮圭獥  瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region  杩斿洖婧愬崟鏁版嵁
+
+            //#region  鑾峰彇婧愬崟鏁版嵁
+            function GetSourceBillList(HSourceInterID, HSourceEntryID, HSourceBillType) {
+                var res = "none";
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "HInterID": HSourceInterID, "HEntryID": HSourceEntryID, "HBillType": HSourceBillType },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data[0];
+                        } else {
+                            res = "none";
+                        }
+                    },
+                    error: function () {
+                        res = "none";
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+            //#region  鍐欏叆婧愬崟鏁版嵁
+            function setInitBySourceBill(dataArray) {
+                var data = dataArray[0];
+                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                    "HSupTypeID": data.HSupTypeID
+                    , "HSupID": data.HSupID
+                    , "HSupName": data.HSupName
+                    , "HDeptID": data.HDeptID
+                    , "HDeptName": data.HDeptName
+                    , "HStockInOrgID": data.HStockInOrgID
+                    , "HStockOutOrgID": data.HStockOutOrgID
+                    , "HStockOrgID": data.HStockOutOrgID
+                });
+                HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID;
+                HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID;
+
+                //绂佺敤缁勭粐閫夐」
+                $("#HStockInOrgID").attr("disabled", "disabled");
+                $("#HStockOutOrgID").attr("disabled", "disabled");
+                form.render('select');
+
+                //瀛愯〃  璧嬪��
+                var rowdata = [];
+                for (let i = 0; i < dataArray.length; i++) {
+                    rowdata.push(
+                        {
+                            "HMaterID": dataArray[i].HMaterID == null ? 0 : dataArray[i].HMaterID
+                            , "HMaterNumber": dataArray[i].HMaterNumber == null ? "" : dataArray[i].HMaterNumber
+                            , "HMaterName": dataArray[i].HMaterName == null ? "" : dataArray[i].HMaterName
+                            , "HMaterModel": dataArray[i].HMaterModel == null ? "" : dataArray[i].HMaterModel
+                            , "HUnitID": dataArray[i].HUnitID == null ? 0 : dataArray[i].HUnitID
+                            , "HUnitNumber": dataArray[i].HUnitNumber == null ? "" : dataArray[i].HUnitNumber
+                            , "HUnitName": dataArray[i].HUnitName == null ? "" : dataArray[i].HUnitName
+                            , "HBatchNo": ""
+                            , "HQty": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                            , "HWHID": dataArray[i].HWHID == null ? 0 : dataArray[i].HWHID
+                            , "HWHNumber": dataArray[i].HWHNumber == null ? "" : dataArray[i].HWHNumber
+                            , "HWHName": dataArray[i].HWHName == null ? "" : dataArray[i].HWHName
+                            , "HSPID": "0"
+                            , "HSPNumber": ""
+                            , "HSPName": ""
+                            , "HSCWHID": dataArray[i].HSCWHID == null ? 0 : dataArray[i].HSCWHID
+                            , "HSCWHNumber": dataArray[i].HSCWHNumber == null ? "" : dataArray[i].HSCWHNumber
+                            , "HSCWHName": dataArray[i].HSCWHName == null ? "" : dataArray[i].HSCWHName
+                            , "HSCSPID": "0"
+                            , "HSCSPNumber": ""
+                            , "HSCSPName": ""
+                            , "HSourceInterID": dataArray[i].HInterID == null ? 0 : dataArray[i].HInterID
+                            , "HSourceEntryID": dataArray[i].HEntryID == null ? 0 : dataArray[i].HEntryID
+                            , "HSourceBillType": dataArray[i].HBillType == null ? "" : dataArray[i].HBillType
+                            , "HSourceBillNo": dataArray[i].HBillNo == null ? "" : dataArray[i].HBillNo
+                            , "HRelationQty": "0"
+                            , "HRelationMoney": "0"
+                            , "HRemark": ""
+                            , "HPropertyID": "0"
+                            , "HSecUnitID": "0"
+                            , "HSecUnitRate": "0"
+                            , "HQtyMust": dataArray[i].HQty == null ? 0 : dataArray[i].HQty
+                            , "HPrice": "0"
+                            , "HMoney": "0"
+                            , "HDesignLife": "0"
+                            , "HLeaveLife": "0"
+                            , "HPOOrderInterID": "0"
+                            , "HPOOrderEntryID": "0"
+                            , "HPOOrderBillNo": ""
+                            , "HSeOrderInterID": "0"
+                            , "HSeOrderEntryID": "0"
+                            , "HSeOrderBillNo": ""
+                            , "HSTOCKORGID": dataArray[i].HStockOutOrgID == null ? 0 : dataArray[i].HStockOutOrgID
+                            , "HOtherOrgID": dataArray[i].HStockInOrgID == null ? 0 : dataArray[i].HStockInOrgID
+                            , "HOWNERID": dataArray[i].HStockOutOrgID == null ? 0 : dataArray[i].HStockOutOrgID
+                            , "HOWNERTYPEID": ""
+                            , "HUseLife": "0"
+                            , "HUseLifeQty": "0"
+                            , "HNewLifeQty": "0"
+                            , "HQtyRel": "0"
+                            , "HSPGroupID": "0"
+                            , "HNewModel": ""
+                            , "HWallThickness": ""
+                            , "HHardness": ""
+                            , "HLastProdModel": ""
+                            , "HDiameter": ""
+                            , "HBackFlag": ""
+                            , "HBarCode": ""
+                            , "HMouldType": "0"
+                            , "HInitModel": ""
+                            , "HInitDesignLife": "0"
+                            , "HLifeUnitID": "0"
+                            , "HNowModel": ""
+                            , "HNowLife": "0"
+                            , "HCorrespondentTypeID": "0"
+                            , "HCorrespondentID": "0"
+                        }
+                    )
+                }
+                option.data = rowdata;
+                table.render(option);
+            }
+            //#endregion
+
+            //#endregion
+
+            //#endregion
+
+            //#region 瀛愯〃鐩稿叧鐩戝惉
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HMaterID": "0"
+                    , "HMaterNumber": ""
+                    , "HMaterName": ""
+                    , "HMaterModel": ""
+                    , "HUnitID": "0"
+                    , "HUnitNumber": ""
+                    , "HUnitName": ""
+                    , "HBatchNo": ""
+                    , "HQty": "0"
+                    , "HWHID": "0"
+                    , "HWHNumber": ""
+                    , "HWHName": ""
+                    , "HSPID": "0"
+                    , "HSPNumber": ""
+                    , "HSPName": ""
+                    , "HSCWHID": "0"
+                    , "HSCWHNumber": ""
+                    , "HSCWHName": ""
+                    , "HSCSPID": "0"
+                    , "HSCSPNumber": ""
+                    , "HSCSPName": ""
+                    , "HSourceInterID": "0"
+                    , "HSourceEntryID": "0"
+                    , "HSourceBillType": ""
+                    , "HSourceBillNo": ""
+                    , "HRelationQty": "0"
+                    , "HRelationMoney": "0"
+                    , "HRemark": ""
+                    , "HPropertyID": "0"
+                    , "HSecUnitID": "0"
+                    , "HSecUnitRate": "0"
+                    , "HQtyMust": "0"
+                    , "HPrice": "0"
+                    , "HMoney": "0"
+                    , "HDesignLife": "0"
+                    , "HLeaveLife": "0"
+                    , "HPOOrderInterID": "0"
+                    , "HPOOrderEntryID": "0"
+                    , "HPOOrderBillNo": ""
+                    , "HSeOrderInterID": "0"
+                    , "HSeOrderEntryID": "0"
+                    , "HSeOrderBillNo": ""
+                    , "HSTOCKORGID": HStockOutOrgID
+                    , "HOtherOrgID": HStockInOrgID
+                    , "HOWNERID": HStockOutOrgID
+                    , "HOWNERTYPEID": ""
+                    , "HUseLife": "0"
+                    , "HUseLifeQty": "0"
+                    , "HNewLifeQty": "0"
+                    , "HQtyRel": "0"
+                    , "HSPGroupID": "0"
+                    , "HNewModel": ""
+                    , "HWallThickness": ""
+                    , "HHardness": ""
+                    , "HLastProdModel": ""
+                    , "HDiameter": ""
+                    , "HBackFlag": ""
+                    , "HBarCode": ""
+                    , "HMouldType": "0"
+                    , "HInitModel": ""
+                    , "HInitDesignLife": "0"
+                    , "HLifeUnitID": "0"
+                    , "HNowModel": ""
+                    , "HNowLife": "0"
+                    , "HCorrespondentTypeID": "0"
+                    , "HCorrespondentID": "0"
+                };
+
+                switch (obj.event) {
+                    //澧炲姞涓�琛�
+                    case 'btn_AddLine': btnAddLine(NewRow);
+                        break;
+                    //鎸囧畾浣嶇疆涓嬫彃鍏ヤ竴琛�
+                    case 'btn_InsertLine': btnInsertLine(NewRow)
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn_CopyLine': btnCopyLine(data);
+                        break;
+                    //涓婄Щ
+                    case 'btn_Up': btn_up();
+                        break;
+                    //涓嬬Щ
+                    case 'btn_Under': btn_under();
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+            //#endregion
+
+            //#region 鍦ㄦ寚瀹氳涓嬫彃鍏ヤ竴琛�
+            function btnInsertLine(NewRow) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var tables = [];                                    //瀛樺偍鎻掑叆涓�琛屽悗鐨勮〃鏍兼暟鎹�
+                    //鑾峰彇琛ㄦ牸鐨勫叏閮ㄨ
+                    var rowList = table.cache['mainTable'];
+                    for (var i = 0; i < rowList.length; i++) {          //閬嶅巻琛ㄦ牸鐨勮
+                        tables.push(option.data[i]);
+                        if (rowList[i].LAY_CHECKED == true) {           //鑾峰彇閫変腑琛岀殑浣嶇疆
+                            tables.push(NewRow);
+                        }
+                    }
+                    option.data = tables;
+                    table.render(option);
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+            //#endregion
+
+            //#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 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({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鏄剧ず鍒楁暟鎹� 姹囨�婚〉绛�
+            function DisPlay_HideColumn_Sum() {
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    async: false,
+                    data: { "HModName": HModName, "user": HMaker },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < Sumoption.cols[0].length - 2; i++) {
+                                if (dataCol[i]) {
+                                    var dataCols = dataCol[i].split('|');
+                                }
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    Sumoption.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    Sumoption.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    Sumoption.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    Sumoption.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(Sumoption.cols[0][i + 1]["title"], titleData) == -1) {
+                                    Sumoption.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        Sumoption.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        Sumoption.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        Sumoption.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < Sumoption.cols[0].length - 1; i++) {
+                                if (Sumoption.cols[0][i]["fixed"] != null) {
+                                    Sumoption.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(Sumoption.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    Sumoption.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(Sumoption);
+                        } else {
+                            table.render(Sumoption);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            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);
+                        }
+                    });
+                }
+            });
+            //#endregion
+
+            //#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') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            obj.del();
+                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.reload(option);
+                            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 == "HMaterNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "鍣ㄥ叿鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2', '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("璇烽�夋嫨鏁版嵁");
+                                    }
+                                    OptionData = checkStatus.data[0];
+                                    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, "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HBatchNo": "", "HQty": 0, "HWHID": 0, "HWHNumber": "", "HWHName": "", "HSPID": 0, "HSPNumber": "", "HSPName": "", "HSCWHID": 0, "HSCWHNumber": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPNumber": "", "HSCSPName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillType": "", "HSourceBillNo": "", "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HPropertyID": 0, "HSecUnitID": 0, "HSecUnitRate": 0, "HQtyMust": 0, "HPrice": 0, "HMoney": 0, "HDesignLife": 0, "HLeaveLife": 0, "HPOOrderInterID": 0, "HPOOrderEntryID": 0, "HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HSTOCKORGID": HStockOutOrgID, "HOtherOrgID": HStockInOrgID, "HOWNERID": HStockOutOrgID, "HOWNERTYPEID": "", "HUseLife": 0, "HUseLifeQty": 0, "HNewLifeQty": 0, "HQtyRel": 0, "HSPGroupID": 0, "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HBarCode": "", "HMouldType": 0, "HInitModel": "", "HInitDesignLife": 0, "HLifeUnitID": 0, "HNowModel": "", "HNowLife": 0, "HCorrespondentTypeID": 0, "HCorrespondentID": 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].hmainid;
+                                            option.data[rowIndex + i].HMaterNumber = checkStatus.data[i].妯″叿缂栧彿;
+                                            option.data[rowIndex + i].HMaterName = checkStatus.data[i].妯″叿鍚嶇О;
+                                            option.data[rowIndex + i].HMaterModel = checkStatus.data[i].妯″叿鍨嬪彿;
+                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
+                                            option.data[rowIndex + i].HUnitNumber = checkStatus.data[i].璁￠噺鍗曚綅浠ｇ爜;
+                                            option.data[rowIndex + i].HUnitName = checkStatus.data[i].璁￠噺鍗曚綅;
+                                            option.data[rowIndex + i].HQty = 1;
+                                        }
+                                        table.render(option); //閲嶆柊娓叉煋琛ㄦ牸浠ユ樉绀烘洿鏂板悗鐨勬暟鎹�
+                                    }
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    if (typeof (OptionData) != "undefined" && OptionData != []) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            HMaterID: OptionData.hmainid,
+                                            HMaterNumber: OptionData.妯″叿缂栧彿,
+                                            HMaterName: OptionData.妯″叿鍚嶇О,
+                                            HMaterModel: OptionData.妯″叿鍨嬪彿,
+                                            HUnitID: OptionData.HUnitID,
+                                            HUnitNumber: OptionData.璁￠噺鍗曚綅浠ｇ爜,
+                                            HUnitName: OptionData.璁￠噺鍗曚綅,
+                                            HDesignLife: 0,  //璁捐瀵垮懡
+                                            HLeaveLife: 0,   //鍓╀綑瀵垮懡
+                                            HQty: 1,         //瀹炴敹鏁伴噺
+                                            HMoney: 0,       //閲戦
+                                        });
+                                    }
+                                    OptionData = [];
+                                }
+                            })
+                        }
+                        //璁￠噺鍗曚綅
+                        if (obj.event == "HUnitNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "璁￠噺鍗曚綅鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?openType=2', '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];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HUnitID": OptionData.HItemID
+                                        , "HUnitNumber": OptionData.璁￠噺鍗曚綅浠ｇ爜
+                                        , "HUnitName": OptionData.璁￠噺鍗曚綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //璋冨叆浠撳簱
+                        if (obj.event == "HWHNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    OptionData = checkStatus.data[0];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HItemID
+                                        , "HWHNumber": OptionData.浠撳簱浠ｇ爜
+                                        , "HWHName": OptionData.浠撳簱鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //璋冨叆浠撲綅
+                        if (obj.event == "HSPNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撲綅鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html?openType=2', '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];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HWHID": OptionData.HWHID
+                                        , "HWHNumber": OptionData.HWHNumber
+                                        , "HWHName": OptionData.鎵�灞炰粨搴�
+                                        , "HSPID": OptionData.HMainID
+                                        , "HSPNumber": OptionData.浠撲綅浠ｇ爜
+                                        , "HSPName": OptionData.浠撲綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //璋冨嚭浠撳簱
+                        if (obj.event == "HSCWHNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撳簱鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/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("璇烽�夋嫨涓�鏉℃暟鎹�");
+                                    }
+                                    OptionData = checkStatus.data[0];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HSCWHID": OptionData.HItemID
+                                        , "HSCWHNumber": OptionData.浠撳簱浠ｇ爜
+                                        , "HSCWHName": OptionData.浠撳簱鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        //璋冨嚭浠撲綅
+                        if (obj.event == "HSCSPNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "浠撲綅鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html?openType=2', '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];
+
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    obj.update({
+                                        "HSCWHID": OptionData.HWHID
+                                        , "HSCWHNumber": OptionData.HWHNumber
+                                        , "HSCWHName": OptionData.鎵�灞炰粨搴�
+                                        , "HSCSPID": OptionData.HMainID
+                                        , "HSCSPNumber": OptionData.浠撲綅浠ｇ爜
+                                        , "HSCSPName": OptionData.浠撲綅鍚嶇О
+                                    })
+                                }
+                            })
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 鍔熻兘鎺т欢
+
+            //#region 鎻愪氦
+            form.on('submit(btn_Save)', function (data) {
+                set_SaveBill(data);
+            });
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                $("#HStockOrgID").val(HStockOutOrgID);
+                //鑾峰彇瀛愯〃鏁版嵁
+                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])
+                    }
+                }
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //瀛愯〃鏁版嵁搴忓垪鍖�
+                var sSubStr = JSON.stringify(num);
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + HMaker;
+
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json",
+                    async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                    data: { "sMainSub": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            layer.close(index);
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            layer.close(index);
+                        }
+                    },
+                    complete: function (XHR, TS) { XHR = null },//鍥炴敹璧勬簮
+                    error: function (err) {
+                        layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        layer.close(index);
+                    }
+                });
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 瀹℃牳
+            form.on('submit(btn_Audit)', function (data) {
+                HInterID = $('#HInterID').val()
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Check_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HInterID": HInterID, "Type": 1, "HMaker": HMaker },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                $("btn-check").addClass('layui-btn-disabled').attr('disabled', true)
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+
+            //#endregion
+
+            //#region 鎵撳嵃
+            form.on("submit(btn_print)", function (data) {
+                HInterID = $('#HInterID').val()
+                if (HInterID != "" || HInterID != null) {
+                    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=' + HInterID.toString() + '&Type=HMouldProdMoveBill', 'yes']
+                        , resize: false
+                    })
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
+                }
+            });
+
+            //#endregion
+
+            //#region 閫�鍑�
+            form.on('submit(btn_Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    Pub_Close(closeType);
+                });
+            })
+            //#endregion
+
+            //#endregion
+
+            //鐩戝惉鍗曞厓鏍肩紪杈�
+            table.on('edit(mainTable)', function (obj) {
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+                //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+                // 璇ョ洃鍚嚱鏁扮殑obj涓殑update鍑芥暟鏈夐棶棰橈紝浣跨敤琛ㄧ紦瀛樺姞绱㈠紩鐨勬柟寮忔洿鏂板搴斿垪鐨勬暟鎹�
+                let tableCache = table.cache['mainTable']
+                let index = $(obj.tr[0]).closest('tr').data('index');
+
+                switch (field) {
+                    case "HDesignLife":  //璁捐瀵垮懡
+                        value = isNaN(value) ? 0 : value;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HDesignLife: value,                          //璁捐瀵垮懡
+                            HLeaveLife: value - HUseLife,           //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HLeaveLife":  //鍓╀綑瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+                        obj.update({
+                            HLeaveLife: HDesignLife - HUseLife,   //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HUseLife":    //浣跨敤瀵垮懡
+                        var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+                        value = isNaN(value) ? 0 : value;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+                        });
+                        break;
+                    case "HQty":        //瀹炲彂鏁伴噺
+                        value = isNaN(value) ? 0 : value;
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        debugger
+                        //if (HQty_Temp > HQtyMust_Temp) {
+                        //    layer.msg("瀹炴敹鏁伴噺鐨勫�间笉寰楀ぇ浜庡簲鏀舵暟閲�!")
+                        //    tableCache[index].HQty = HQtyMust_Temp == 0 ? 0 : 1;
+                        //}
+                        tableCache[index].HMoney = HPrice * tableCache[index].HQty;
+                        table.reload('mainTable', {
+                            data: tableCache
+                        })
+                        break;
+                    case "HPrice":      //鍗曚环
+                        value = isNaN(value) ? 0 : value;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    case "HMoney":     //閲戦
+                        var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+                        var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+                        });
+                        break;
+                    default:
+                }
+            });
+
+
+        });
+
+        //浠ヤ笂涓簂ayui妯″潡
+        //姝ゅ鏂规硶娑夊強鍒拌澶栭儴椤甸潰parent.鏂规硶鍚嶈皟鐢ㄧ殑蹇呴』鏀惧湪Layui鏂规硶澶栭儴
+
+        //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    琛ㄥご
+        function GetHSupNameValue(obj)      //寰�鏉ュ崟浣嶏紙渚涘簲鍟嗭級
+        {
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+
+        function GetHCusNameValue(obj)      //寰�鏉ュ崟浣嶏紙瀹㈡埛锛�
+        {
+            $("#HSupName").val(obj[0].瀹㈡埛鍚嶇О);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue1(obj)    //寰�鏉ュ崟浣嶏紙閮ㄩ棬锛�
+        {
+            $("#HSupName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HSupID").val(obj[0].HItemID);
+        }
+        function GetHDeptNameValue2(obj)     //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+        function GetHWHValue(obj)           //杩斿洖璋冨叆浠撳簱
+        {
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHNumber").val(obj[0].浠撳簱浠ｇ爜);
+            $("#HWHID").val(obj[0].HItemID);
+        }
+        function GetHSCWHValue(obj)         //杩斿洖璋冨嚭浠撳簱
+        {
+            $("#HSCWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HSCWHNumber").val(obj[0].浠撳簱浠ｇ爜);
+            $("#HSCWHID").val(obj[0].HItemID);
+        }
+        function GetHEmpValue(obj)          //杩斿洖涓氬姟鍛�
+        {
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        function GetHManagerValue(obj)      //杩斿洖璐熻矗浜�
+        {
+            $("#HManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HManagerID").val(obj[0].HItemID);
+        }
+        function GetHSecManagerValue(obj)   //杩斿洖楠屾敹鍛�
+        {
+            $("#HSecManagerName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HSecManagerID").val(obj[0].HItemID);
+        }
+        function GetHKeeperValue(obj)       //杩斿洖淇濈鍛�
+        {
+            $("#HKeeperName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HKeeperID").val(obj[0].HItemID);
+        }
+        function GetMouldMoveStockRequestBillValue(obj) { //鍣ㄥ叿璋冩嫧鐢宠鍗�
+            var objData = {};
+            objData.data = obj;
+            GetSourceBillList(objData);
+        }
+
+        //鍙屽嚮杩斿洖鍩虹璧勬枡鏁版嵁    鍒楄〃
+        function GetMouldFileValue(obj)    //杩斿洖鍣ㄥ叿
+        {
+            OptionData = obj[0];
+        }
+        function GetUnitValue(obj)          //杩斿洖璁￠噺鍗曚綅
+        {
+            OptionData = obj[0];
+        }
+        function GetGyWarehouse(obj)       //杩斿洖璋冨叆浠撳簱
+        {
+            OptionData = obj[0];
+        }
+        function GetHWHSubValue(obj)     //杩斿洖璋冨嚭浠撳簱
+        {
+            OptionData = obj[0];
+        }
+
+        //鍗曟嵁涓婁紶鍓嶅垽鏂�
+        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+            var Result = true;
+            if (typeof (sSubStr) == "undefined") {
+                layer.msg("娌℃湁鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i <= sSubStr.length - 1; i++) {
+                    if (sSubStr[i].HMaterID == "0") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HWHID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HSCWHID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HUnitID == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璁￠噺鍗曚綅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    if (sSubStr[i].HQty == "0") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏁伴噺涓嶈兘涓�0!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                    ////鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                    //if (parseFloat(sSubStr[i].HQty) == 0) {
+                    //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    //    return Result = false;
+                    //}
+                }
+            }
+            else {
+                return Result;
+            }
+            return Result;
+        }
+    </script>
+</body>
+
+</html>
\ No newline at end of file
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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
index dd3adf7..7c3bb37 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdMoveBillList.html"
@@ -1,33 +1,32 @@
 锘�<!DOCTYPE html>
 <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">
+    <!--寮曠敤layui鏍峰紡鏂囦欢-->
     <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>
+    <!--寮曠敤layui js鏂囦欢-->
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/HideButton.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/common.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
-    <script src="../../../layuiadmin/HideButton_New.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">
@@ -41,150 +40,107 @@
                                         <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;">
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
                                         </select>
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
-                                            style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃ユ湡</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
-                                            style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" 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">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
                                     </div>
                                 </div>
-
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
-                                    lay-filter="btnSearch" id="btnSearch">
+                                <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>
+                                <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 style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content">
+                                <div class="layui-colla-content" style="padding: 6px; margin-left: 6%;">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+                                        <label class="layui-form-label">鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select name="HStatus" lay-filter="HStatus" style="width:190px;"
+                                                    class="ForFilteringSchemes" id="HStatus">
+                                                <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                                <option value="0">鏈鏍�</option>
+                                                <option value="1">宸插鏍�</option>
+                                                <option value="2">宸插叧闂�</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="HOrgID" id="HOrgID" lay-verify="HOrgID"
-                                                class="ForFilteringSchemes">
+                                            <select name="HStockOutOrgID" id="HStockOutOrgID" lay-verify="HStockOutOrgID"
+                                                    class="ForFilteringSchemes">
                                                 <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                             </select>
                                         </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="HDept"
-                                                id="HDept" 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="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="HModelNumber" id="HModelNumber" 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">寰�鏉ュ崟浣�</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSupName"
-                                                id="HSupName" style="width:190px;">
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
+                                    <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 class="layui-inline">
+                                                <span>鍏朵粬鏉′欢></span>
                                             </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>
+                                            <label class="layui-form-label">閮ㄩ棬淇℃伅</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input ForFilteringSchemes" name="HDept"
+                                                       id="HDept" style="width:190px;">
+                                            </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
-                                                name="ColContent" id="ColContent">
+                                            <label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
+                                            <div class="layui-input-block">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                       name="HModelNumber" id="HModelNumber" 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;">
+                                            </div>
                                         </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"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                            <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="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -192,33 +148,26 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1"
-                                                class="ForFilteringSchemes" id="ColContent1">
+                                            <input type="text" class="layui-input ForFilteringSchemes" 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="ColName2" id="ColName2" lay-filter="ColName2"
-                                                    class="ForFilteringSchemes" style="width:190px;">
+                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2"
-                                                class="ForFilteringSchemes" style="width:190px;">
+                                            <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="<="><=</option>
+                                                <option value="<"><</option>
+                                                <option value="<>"><></option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -226,8 +175,34 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2"
-                                                class="ForFilteringSchemes" id="ColContent2">
+                                            <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" 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>
@@ -236,24 +211,27 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <div id="page" style="position: relative; bottom: 0;"></div>
                         <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Copy" id="Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Copy" id="btn_Copy"><i class="layui-icon layui-icon-transfer"></i>澶嶅埗</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAudit" id="btn_DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AuditAll" id="btn_AuditAll"><i class="layui-icon layui-icon-radio"></i>瀹℃牳(鎵归噺)</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_DeAuditAll" id="btn_DeAuditAll"><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-circle"></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-circle"></i>鍙嶄綔搴�</button>
                                 <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-audit" id="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit" id="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" 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="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
-                                <button type="button" class="layui-btn layui-btn-sm" 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>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" id="btn_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideColumn" id="btn_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_HideButton" id="btn_HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_SaveScheme" id="btn_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_ReadScheme" id="btn_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
                             </div>
                         </script>
                     </form>
@@ -261,16 +239,13 @@
             </div>
         </div>
     </div>
-    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙ｆā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -279,75 +254,41 @@
                 , element = layui.element
                 , laypage = layui.laypage
                 , laydate = layui.laydate
-                , util = layui.util
                 , soulTable = layui.soulTable
-            //鏌ヨ鏉′欢
-            var sWhere = "";
-            var option = [];
             var HModName = "Sc_MouldProdMoveBillList";
             var HBillType = "3814";
-            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
-            var optionPage = [];
-            var Organization = sessionStorage["Organization"];
-
+            var Type = "3814";
+            var HMaker = sessionStorage["HUserName"]
+            var HStockInOrgID = sessionStorage["OrganizationID"]    //璋冨叆缁勭粐ID
+            var HStockOutOrgID = sessionStorage["OrganizationID"]   //璋冨嚭缁勭粐ID
+            var sWhere = "";
             var ins;                //鐢ㄤ簬瀵煎嚭excel
+            var option = [];
+            var columns = "";
             var page = 1;//鍒嗛〉鏁版嵁
             var size = 50;
-            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = [];
+            var titleData = [];     //涓嶉渶瑕佹樉绀虹殑瀛楁
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
+            //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
 
             //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "鍣ㄥ叿鐩存帴璋冩嫧鍗�";
+            window.HModuleName = "鍣ㄥ叿璋冩嫧鍗曞垪琛�";
             //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
             window.HDefaultFilter = "";
             //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
             window.HInterID_Choose = 0;
-            //#endregion
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "3814";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion
-
-            //鍒濆鍖栫晫闈�
-            set_ClearBill();
 
             //#endregion
 
-            //#region 鎺掑簭鍚庨�夋嫨
-            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
-                table.reload('mainTable', {
-                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
-                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
-                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
-                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
-                    }
-                });
-                option.data = layui.table.cache["mainTable"];
-                table.render(option);
-                //鍒锋柊鎸夐挳鏄剧ず
-                Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-            });
-            //#endregion
-
-            //#region 閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                optionPage.curr = 1;
-                //娓呯┖杩囨护鏉′欢
-                set_ClearQuery();
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                optionPage.curr = 1;
-                get_FastQuery(table, option);
-            });
-            //#endregion
+            //#region 鍥炶溅鏌ヨ
 
             //杈撳叆妗嗗洖杞︽柟娉�
             $('input').on('keydown', function (event) {
@@ -356,7 +297,29 @@
                 }
             });
 
-            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var HInterID = data.hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html?OperationType=2&HInterID=' + HInterID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                }
+            });
+
+            //#endregion
+
+            //#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -364,8 +327,8 @@
                     $('#HBeginDate').prop('disabled', true);
                     $('#HEndDate').prop('disabled', true);
 
-                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
 
                     //鎵ц鏌ヨ鏂规硶
                     get_FastQuery();
@@ -375,10 +338,17 @@
                 }
             });
 
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //#region 鍒濆鍖栫晫闈�
+
+            set_ClearBill();
+
             function set_ClearBill() {
-                // 鍒濆鍖栫粍缁�
+                //鍒濆鍖栫粍缁�
                 Organ();
                 //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
                 setSelect_HInitTimeCycle();
@@ -392,103 +362,72 @@
                     $('#HEndDate').prop('disabled', false);
                 }
 
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
-                //鏌ヨ
-                get_FastQuery();
-                //鍒濆鍖栭〉澶у皬
-                DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
-                //榛樿鏂规
-                get_DefaultModule()
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
             }
             //#endregion
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
 
+            //#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>';
+                            }
+                            $("#HStockOutOrgID").append(Organization);
+                            $("#HStockOutOrgID").val(HStockOutOrgID)
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
                     , page: false
                     , totalRow: true
+                    , height: 'full-50'
                     , cellMinWidth: 90
-                    , limits: [50, 500, 5000, 20000]
+                    , limit: 50
+
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
-                    , limit: 50
-                    , cols: [[
-                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
-                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true, sort: true }
-                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
-                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
-                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true }
-                        , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
-                        , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125, sort: true }
-                        , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125, sort: true }
-                        , { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true, sort: true }
-                        , { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180, sort: true }
-                        , { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125, sort: true }
-                        , { field: 'HKeeperID', title: 'HKeeperID', width: 200, hide: true, sort: true }
-                        , { field: '鍙戞枡浜轰唬鐮�', title: '鍙戞枡浜轰唬鐮�', width: 180, sort: true }
-                        , { field: '鍙戞枡浜�', title: '鍙戞枡浜�', width: 125, sort: true }
-                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
-                        , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115, sort: true }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125, sort: true }
-                        , { field: '鎽樿', title: '鎽樿', width: 125, sort: true }
-                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125, sort: true }
-                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115, sort: true }
-                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
-                        , { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true, sort: true }
-                        , { field: '妯″叿浠ｇ爜', title: '鍣ㄥ叿浠ｇ爜', width: 125, sort: true }
-                        , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', width: 125, sort: true }
-                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 125, sort: true }
-                        , { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true, sort: true }
-                        , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100, sort: true }
-                        , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125, sort: true }
-                        , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125, sort: true }
-                        , { field: '搴撳瓨缁勭粐', title: '搴撳瓨缁勭粐', width: 125, sort: true }
-                        , { field: 'HWHID', title: 'HWHID', width: 200, hide: true, sort: true }
-                        , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125, sort: true }
-                        , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125, sort: true }
-                        , { field: 'HSPID', title: 'HSPID', width: 200, hide: true, sort: true }
-                        , { field: '璋冨叆浠撲綅浠ｇ爜', title: '璋冨叆浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
-                        , { field: '璋冨叆浠撲綅', title: '璋冨叆浠撲綅', width: 125, hide: true, sort: true }
-                        , { field: 'HSCWHID', title: 'HSCWHID', width: 200, hide: true, sort: true }
-                        , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 125, sort: true }
-                        , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 125, sort: true }
-                        , { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true, sort: true }
-                        , { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true, sort: true }
-                        , { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true, sort: true }
-                        , { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125, sort: true, totalRow: true }
-                        , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125, sort: true, totalRow: true }
-                        , { field: '鍗曚环', title: '鍗曚环', width: 125, sort: true, totalRow: true }
-                        , { field: '閲戦', title: '閲戦', width: 125, sort: true, totalRow: true }
-                        , { field: '璁捐瀵垮懡', title: '璁捐瀵垮懡', width: 125, sort: true, totalRow: true }
-                        , { field: '绱Н浣跨敤瀵垮懡', title: '绱Н浣跨敤瀵垮懡', width: 125, sort: true, totalRow: true }
-                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', width: 125, sort: true, totalRow: true }
-                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125, sort: true, totalRow: true }
-                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125, sort: true }
-                        , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 125, sort: true }
-                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125, sort: true }
-                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125, sort: true }
-                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125, sort: true }
-                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125, sort: true }
-                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125, sort: true }
-                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
-                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125, sort: true }
-                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125, sort: true }
-                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true, sort: true }
-                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 125, sort: true }
-                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 125, sort: true }
-                    ]]
                 };
                 optionPage = {
                     elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
@@ -513,292 +452,7 @@
                 }
                 laypage.render(optionPage);
             }
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Sc_MouldProdMoveBill/GetMouldProdMoveBill',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(ajaxLoad);
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-            //鍒嗛〉鏌ヨ
-            function get_DisplayPage() {
-                var ajaxLoad = layer.load();
-                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-                $.ajax({
-                    url: GetWEBURL() + '/Sc_MouldProdMoveBill/page',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
-                    success: function (data1) {
-                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
-                        optionPage.count = data1.count;
-                        if (data1.code == "1") {
-                            var data = [];
-                            var col = [];
-                            //缁欑┖鐨勬暟缁勮祴鍊�
-                            for (var key in data1.list) {
-                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
-                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
-                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
-                                var patrn = new RegExp(/^h/i);
-                                if (patrn.test(data1.list[key].ColmCols)) {
-                                    titleData[key] = data1.list[key].ColmCols;
-                                }
-                            }
-                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
-                            for (var i = 0; i < data.length; i++) {
-                                if ($.inArray(data[i].name, titleData) > -1) {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
-                                }
-                                else {
-                                    switch (data[i].Type) {
-                                        //int
-                                        case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
-                                            break;
-                                        case 'long':
-                                        case 'Int32':
-                                        case 'Int64':
-                                        case 'double':
-                                        case 'Decimal':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
-                                            break;
-                                        default:
-                                            if (data[i].name === '鍗曟嵁鍙�') {
-                                                col.push({
-                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
-                                                    templet: function (d) {
-                                                        return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
-                                                    }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
-                                                });
-                                            } else {
-                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
-                                            }
-                                    }
-                                }
-                            }
-                            option.cols = [col];
-                            option.data = data1.data;
-                            //鍒楄缃�
-                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, []);
-
-                            ins = table.render(option);
-
-                            laypage.render(optionPage);
-
-                            if ($("#ColName option").length < 1) {
-                                ColFilter();
-                                get_DefaultModule();
-                            }
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-
-                            layer.close(ajaxLoad);
-                        } else {
-                            option.data = [];
-                            ins = table.render(option);
-                            laypage.render(optionPage);
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-            //澶村伐鍏锋爮浜嬩欢
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
-                switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板' + HPageTitle,
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
-                        break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫' + HPageTitle
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                $("#btnSearch").trigger('click');
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                    case 'btn-view': get_ViewReport();
-                        break;
-                    case 'btn-print': get_PrintReport();
-                        break;
-                    //瀹℃牳
-                    case 'btn-audit': get_Audit();
-                        break;
-                    //鍙嶅鏍�
-                    case 'btn-Faudit': get_FAudit();
-                        break;
-                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
-                    case 'btn-Close':
-                        set_CloseBill(0);
-                        break;
-                    //鍙嶅叧闂寜閽�
-                    case 'btn-DeClose':
-                        set_CloseBill(1);
-                        break;
-                    //鍒锋柊
-                    case 'get_Refresh': get_Refresh();
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'get_Exit': Pub_Close(2);
-                        break;
-                    //鍒楄缃�
-                    case 'set_HideColumn':
-                        get_HideColumn(HModName, sessionStorage["HUserName"], option, optionPage, get_FastQuery);
-                        break;
-                    //鎸夐挳璁剧疆
-                    case 'set_HideButton':
-                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-                        break;
-                    //淇濆瓨鏂规
-                    case 'set_SaveScheme': set_SaveScheme();
-                        break;
-                    //璇诲彇鏂规
-                    case 'set_ReadScheme': set_ReadScheme();
-                        break;
-                    // 澶嶅埗鎸夐挳
-                    case 'btn-Copy': set_AddCopy();
-                        break;
-                    //瀵煎嚭鎸夐挳
-                    case 'btn_Export': btn_Export();
-                        break;
-                };
-            });
-
-            // 琛ㄦ牸鑷畾涔変簨浠�
-            table.on("tool(mainTable)", function (obj) {
-                let data = obj.data;
-                switch (obj.event) {
-                    case 'onHBillNumberClickHandler': onHBillNumberClickHandler(data); break;
-                }
-            })
-            //瀹℃牳
-            function get_Audit() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    $.ajax({
-                        type: "GET",
-                        url: GetWEBURL() + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 1 },
-                        success: function (result) {
-                            if (result.count == 1) {
-                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    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 鐐瑰嚮琛岄�変腑楂樹寒
             table.on('row(mainTable)', function (obj) {
@@ -821,73 +475,417 @@
             })
             //#endregion
 
-            // 鐐瑰嚮瓒呴摼鎺�
-            function onHBillNumberClickHandler(data) {
-                var hID = data.hmainid
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '缂栬緫' + HPageTitle
-                    , closeBtn: 1
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                    , resize: false,
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    }
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+                            newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+                            dataCol = data1.data[0].HGridString.split(',');
+                            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+                            if (dataCol.length == option.cols[0].length - 1) {
+                                //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+                                for (var j = 0; j < option.cols[0].length - 1; j++) {
+                                    for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                        var dataCols = dataCol[j].split('|');
+                                        //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                                        if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                                            //闅愯棌鍒�
+                                            if (dataCols[1] == 1) {
+                                                option.cols[0][i + 1]["hide"] = true;
+                                            }
+                                            //璁剧疆鍒楀
+                                            if (dataCols[3] > 0) {
+                                                option.cols[0][i + 1]["width"] = dataCols[3];
+                                            }
+                                            //璁剧疆鍐呭瀛椾綋澶у皬
+                                            if (data1.data[0].HFontSize != 0) {
+                                                option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                            } else {
+                                                option.cols[0][i + 1]["style"] = "font-size:100%";
+                                            }
+                                            //鏄剧ず鍒�
+                                            if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                                option.cols[0][i + 1]["hide"] = false;
+                                            }
+                                            //缁熻鍒�
+                                            if (dataCols[6] == 1) {
+                                                option.cols[0][i + 1]["totalRow"] = true;
+                                            }
+                                            //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                            switch (dataCols[2]) {
+                                                case "L":
+                                                    option.cols[0][i + 1]["align"] = "left";
+                                                    break;
+                                                case "M":
+                                                    option.cols[0][i + 1]["align"] = "center";
+                                                    break;
+                                                case "R":
+                                                    option.cols[0][i + 1]["align"] = "right";
+                                                    break;
+                                            }
+                                            //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                            if (dataCols[4] != null && dataCols[4] != "") {
+                                                option.cols[0][i + 1]["title"] = dataCols[4];
+                                            }
+                                            newCols[0].push(option.cols[0][i + 1]);
+                                        }
+                                    }
+                                }
+                                //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+                                if (dataCol.length == newCols[0].length - 1) {
+                                    option.cols = newCols;
+                                    //鍙栨秷鍐荤粨鍒�
+                                    for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                        if (option.cols[0][i]["fixed"] != null) {
+                                            option.cols[0][i]["fixed"] = null;
+                                        }
+                                        else {
+                                            break;
+                                        }
+                                    }
+                                    //鍐荤粨鍒�
+                                    if (data1.data[0].HFixCols != 0) {
+                                        for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                            if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                                data1.data[0].HFixCols += 1;
+                                            }
+                                            option.cols[0][i + 1]["fixed"] = "left";
+                                        }
+                                    }
+                                }
+                            }
+                            table.render(option);
+                            ins = table.render(option);
+                        } else {
+                            table.render(option);
+                            ins = table.render(option);
+                        }
+                        //鍒锋柊鎸夐挳鏄剧ず
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        Display_HideButton(btns, HBillType, HModName, HMaker);
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 })
             }
+            //#endregion
 
-            //鍙嶅鏍�
-            function get_FAudit() {
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn_Add': btn_Add();
+                        break;
+                    // 澶嶅埗鎸夐挳
+                    case 'btn_Copy': set_AddCopy();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn_Edit': btn_Edit();
+                        break;
+                    //鍒锋柊鎸夐挳
+                    case 'btn_Refresh': btn_Refresh();
+                        break;
+                    //鎵撳嵃
+                    case 'btn-print': get_PrintReport();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn_Delete': btn_Delete();
+                        break;
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_Audit': set_CheckBill(1);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn_DeAudit': set_CheckBill(2);
+                        break;
+                    //瀹℃牳鎸夐挳 鎵归噺     锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn_AuditAll': set_CheckBillAll(1);
+                        break;
+                    //鍙嶅鏍告寜閽� 鎵归噺
+                    case 'btn_DeAuditAll': set_CheckBillAll(2);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn_Close': set_CloseBill(1);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn_DeClose': set_CloseBill(2);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn_Drop': set_DropBill(1);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn_DeDrop': set_DropBill(2);
+                        break;
+                    //瀵煎嚭鎸夐挳
+                    case 'btn_Export': btn_Export();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'btn_HideColumn': get_HideColumn();
+                        break;
+                    //鎸夐挳璁剧疆
+                    case 'btn_HideButton':
+                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                        get_HideButton(btns, HBillType, HModName, HMaker);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'btn_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'btn_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鏂板
+            function btn_Add() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim'   //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: HPageTitle + '- 鏂板'
+                    , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html?OperationType=1&HInterID=0'
+                    , btn: ['纭畾'],
+                    // 鎸夐挳1 鐨勫洖璋�
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 澶嶅埗
+            function set_AddCopy() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 澶嶅埗'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html?OperationType=3&linterid=' + HInterID
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
+                }
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: HPageTitle + '- 缂栬緫'
+                        , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillEdit.html?OperationType=2&HInterID=' + HInterID
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            $("#btnSearch").trigger('click');
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function btn_Refresh() {
+                get_FastQuery();
+            }
+            //#endregion
+
+            //#region 鎵撳嵃鍔熻兘
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                if (checkStatus.data.length === 0) {
+                    return layer.msg('璇烽�夋嫨鏁版嵁鎵撳嵃锛�');
+                }
+                else {
+                    var hmainid = [];
+                    for (var i = 0; i < checkStatus.data.length; i++) {
+                        hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
+                    }
+
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '鎵撳嵃妯＄増閫夋嫨'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HMouldProdMoveBillList', 'yes']
+                        , resize: false
+                    })
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function btn_Delete() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+                    var HBillNo = data[0].鍗曟嵁鍙�.toString();
+                    layer.confirm("纭瑕佸垹闄ら�変腑琛屾暟鎹紵鍒犻櫎鍚庡皢涓嶅彲鎭㈠锛�", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Delete_Json",
+                            async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                            data: { "HInterID": HInterID, "HMaker": HMaker },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg("鍗曟嵁鍙凤細" + HBillNo + " 鍒犻櫎鎴愬姛锛�", { time: 1 * 1000, icon: 1 }, function () {
+                                        //鍒锋柊鐣岄潰
+                                        $("#btnSearch").trigger('click');
+                                        layer.close(wait);
+                                    });
+
+                                } else {
+                                    layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+
+            //#region  瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "Sc_MouldProdMoveBill/AuditMouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "user": sessionStorage["HUserName"], "flag": 2 },
+                        url: GetWEBURL() + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Check_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
                         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 });
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒');
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                    }
                 }
             }
-            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            //#endregion
+
+            //#region  鎵归噺瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛�
+            function set_CheckBillAll(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length != 0) {
+                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//灏嗗璞℃暟缁刬d鎻愬彇鍘婚噸
+                    var queryString =uniqueIds.join(",");//灏唅ds鍙樻垚鏁扮粍
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdMoveBillController/CheckAll",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "ids": queryString, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                }
+                else {
+                   layer.msg('璇烽�夋嫨鏁版嵁瀹℃牳锛�');
+
+                }
+            }
+            //#endregion
+
+            //#region 鍏抽棴锛坣um=1锛�/鍙嶅叧闂紙num=2锛�
             function set_CloseBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var InterID = data[0].hmainid.toString();
-                    //閫昏緫瀹℃牳鏂规硶
+                    var HInterID = data[0].hmainid.toString();
                     $.ajax({
                         type: "GET",
-                        url: GetWEBURL() + "/Sc_MouldProdMoveBill/CloseSc_MouldProdMoveBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        url: GetWEBURL() + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Close_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
                         success: function (result) {
                             if (result.count == 1) {
                                 layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -900,90 +898,64 @@
                                 });
 
                             } else {
-                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             }
                         }, error: function () {
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                         }
                     });
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹叧闂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽鍏抽棴锛�');
+                    }
                 }
             }
             //#endregion
-            //棰勮
-            function get_ViewReport() {
+
+            //#region 浣滃簾锛坣um=1锛�/鍙嶄綔搴燂紙num=2锛�
+            function set_DropBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯＄増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdMoveBill', 'yes']
-                        , resize: false
-                    })
+                    var HInterID = data[0].hmainid.toString();
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Cancelltion_Json",
+                        async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
+                        data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
+                        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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        }, error: function () {
+                            layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
                 }
                 else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+                    if (num == 1) {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹綔搴燂紒');
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽浣滃簾锛�');
+                    }
                 }
             }
-
-            //鎵撳嵃
-            function get_PrintReport() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '鎵撳嵃妯＄増閫夋嫨'
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HMouldProdMoveBill', 'yes']
-                        , resize: false
-                    })
-                }
-                else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
-                }
-            }
-
-            //澶嶅埗
-            function set_AddCopy() {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                if (checkStatus.data.length === 1) {
-                    var hID = data[0].hmainid.toString();
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '澶嶅埗' + HPageTitle
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html?OperationType=2&linterid=' + hID + '&HSouceBillType=0&closeType=1'
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-
-                } else {
-                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鍒讹紒');
-                }
-            }
+            //#endregion
 
             //#region 瀵煎嚭Execel
             function btn_Export() {
@@ -1000,51 +972,111 @@
 
                 table.exportFile(ins.config.id, option.data, "xls");
             }
+            //#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>';
-                            }
-                            $("#HOrgID").append(Organization);
-                            $("#HOrgID").val(sessionStorage["OrganizationID"])
-                            form.render('select');
-                        }
-                        layer.closeAll("loading");
+            //#region 鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+                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_New.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 get_FastQuery(table, option) {
-                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
-                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
-                var HStockOrgName = $("#HStockOrgName").val(); //缁勭粐
-                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
-                var HDept = $("#HDept").val();       //閮ㄩ棬淇℃伅
-                var HMaterNumber = $("#HMaterNumber").val();   //鐗╂枡浠ｇ爜    
-                var HModelNumber = $("#HModelNumber").val();    //鍣ㄥ叿浠ｇ爜
-                var HWhName = $("#HWhName").val();  //浠撳簱鍚嶇О
-                //var HSupName = $("#HSupName").val();    //寰�鏉ュ崟浣�
-                var ColName = $("#ColName").val();//澶嶉�夋
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
+            });
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HInitTimeCycle").val("29");
+                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));;//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HStatus").val("-1")
+                $("#HStockOutOrgID").val(HStockOutOrgID)
+                $("#HDept").val("");
+                $("#HModelNumber").val("");
+                $("#HSupName").val("");
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
+            });
+
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();    //鐘舵��
+                var HBeginDate = $("#HBeginDate").val();            //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();                //缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();                  //鍗曟嵁鍙�
+                var HDept = $("#HDept").val();                      //閮ㄩ棬淇℃伅
+                var HModelNumber = $("#HModelNumber").val();        //鍣ㄥ叿浠ｇ爜
+                var HSupName = $("#HSupName").val();                //寰�鏉ュ崟浣�
+                var ColName = $("#ColName").val();                  //澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
-                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var ColName1 = $("#ColName1").val();                //澶嶉�夋
                 var Comparator1 = $("#Comparator1").val()
                 var ColContent1 = $("#ColContent1").val();
-                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var ColName2 = $("#ColName2").val();                //澶嶉�夋
                 var Comparator2 = $("#Comparator2").val()
                 var ColContent2 = $("#ColContent2").val();
+                HStockOutOrgID = $('#HStockOutOrgID').val()
+
                 if (ColName != 0 && Comparator != 0) {
                     var com = "";
                     switch (Comparator) {
@@ -1103,20 +1135,33 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            com2 = "" + Comparator + "'" + ColContent + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
                 }
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈鏍�
+                            sWhere += " and 瀹℃牳浜�=''";
+                            break;
+                        case '1':    //宸插鏍�
+                            sWhere += " and 瀹℃牳浜�<>''";
+                            break;
+                        case '2':    //宸插叧闂�
+                            sWhere += " and 鍏抽棴浜�<>''";
+                        default:
 
+                    }
+                }
                 if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                    sWhere += " and 鏃ユ湡 >= '" + HBeginDate + "'";
                 }
                 if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
-                }
-                if (HStockOrgName) {
-                    sWhere += " and 搴撳瓨缁勭粐 like '%" + HStockOrgName + "%'";
+                    sWhere += " and 鏃ユ湡 <= '" + HEndDate + "'";
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -1124,46 +1169,100 @@
                 if (HDept) {
                     sWhere += " and 閮ㄩ棬 like '%" + HDept + "%'";
                 }
-                if (HMaterNumber) {
-                    sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
-                }
                 if (HModelNumber) {
-                    sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
+                    sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + HModelNumber + "%'";
                 }
-                if (HWhName) {
-                    sWhere += " and 鍣ㄥ叿浠撳簱 like '%" + HWhName + "%'";
+                if (HSupName) {
+                    sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
                 }
-                //if (HSupName) {
-                //    sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
-                //}
+                sWhere += " and HSTOCKORGID=" + HStockOutOrgID;
                 get_DisplayPage(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
+
             //#endregion
-            //#region 閲嶇疆杩囨护鏉′欢
-            function set_ClearQuery() {
-                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-                $("#HBillNo").val("");
-                $("#HDept").val("");
-                $("#HMaterNumber").val("");
-                $("#HModelNumber").val("");
-                $("#HWhName").val("");
-                $("#HSupName").val("");
-                $("#HStockOrgName").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                form.render('select');
-                sWhere = "";
-                get_FastQuery();
+
+            //#region 鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var wait = layer.load();//閬僵
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MouldProdMoveBillController/page',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size, "Type": Type },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                // if (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 (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 });
+                                            break;
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                    }
+                                }
+                            }
+
+                            columns = col;
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            option.totalRow = true;
+                            laypage.render(optionPage);
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            //option.data = [[]]
+                            //table.render(option);
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
             }
             //#endregion
 
@@ -1172,7 +1271,7 @@
                 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>';
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                     }
                 }
                 $("#ColName").empty();
@@ -1184,31 +1283,6 @@
                 form.render('select');
             }
             //#endregion
-
-            //#region 鍒锋柊
-            function get_Refresh() {
-                set_ClearQuery();
-                //get_FastQuery();
-                //get_Display(sWhere);
-            }
-            //#endregion
-
-            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
-            function setSelect_HInitTimeCycle() {
-                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
-                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
-
-                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
-                for (var i = 0; i < valueList.length; i++) {
-                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
-                }
-
-                $("#HInitTimeCycle").empty();
-                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
-                form.render('select');
-
-                $("#HInitTimeCycle").val("29");
-            }
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -1248,8 +1322,8 @@
                                 $('#HBeginDate').prop('disabled', true);
                                 $('#HEndDate').prop('disabled', true);
 
-                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                                $("#HBeginDate").val(Pub_Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
 
 
                                 //鎵ц鏌ヨ鏂规硶
@@ -1259,16 +1333,16 @@
                                 $('#HEndDate').prop('disabled', false);
                             }
 
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            //鏌ヨ
+                            get_FastQuery();
                             form.render("select");
                         } else {
                             //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery();
+                            form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1437,21 +1511,7 @@
 
             //#endregion
 
-
-            ////鐩戝惉琛屽弻鍑讳簨浠�
-            //table.on('rowDouble(mainTable)', function (obj) {
-            //    layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            //});
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
         //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
@@ -1492,11 +1552,7 @@
             });
         }
         //#endregion
-
-
-
     </script>
 
 </body>
-
-</html>
\ No newline at end of file
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index bbd8e45..6e6467f 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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.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\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -491,6 +491,8 @@
                     if (temp != "none") {
                         dataArray.push(temp);
                     } else {
+                        var err = "鏈煡璇㈠埌鍗曟嵁鍙笅鎺ㄦ暟鎹紝璇峰埛鏂板崟鎹垪琛ㄥ悗閲嶆柊閫夋嫨鍗曟嵁涓嬫帹锛�";
+                        layer.alert(err, { icon: 5 });
                         return;
                     }
                 }
@@ -538,7 +540,7 @@
                 var ajaxLoad = layer.load();
                 $.ajax({
                     type: "GET",
-                    url: GetWEBURL() + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Json",
+                    url: GetWEBURL() + "/Sc_MouldStockBillController/GetSc_MouldStockBill_Json",
                     async: false,    //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
                     data: { "HInterID": HInterID, "HMaker": HMaker },
                     success: function (result) {
@@ -546,6 +548,10 @@
                             var data = result.data[0];
                             if (data[0].瀹℃牳浜� != "") {
                                 $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
+                            }
+                            if (data[0].HSourceInterID != "0") {
+                                $("#HStockOrgID").attr("disabled", "disabled");
+                                form.render('select');
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HBillNo": data[0].鍗曟嵁鍙�
@@ -555,7 +561,7 @@
                                 , "HSupName": data[0].寰�鏉ュ崟浣�
                                 , "HDeptID": data[0].HDeptID
                                 , "HDeptName": data[0].閮ㄩ棬
-                                , "HWHID": data[0].HWHID
+                                , "HWHID": data[0].HMainWHID
                                 , "HWHName": data[0].璋冨叆浠撳簱
                                 , "HEmpID": data[0].HEmpID
                                 , "HEmpName": data[0].涓氬姟鍛�
@@ -630,13 +636,13 @@
                         , { field: 'HWHNumber', title: '浠撳簱浠ｇ爜', width: 100, edit: 'text', event: "HWHNumber" }   //F7
                         , { field: 'HWHName', title: '浠撳簱鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
                         , { field: 'HSPID', title: 'HSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
-                        , { field: 'HSPNumber', title: '浠撲綅浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSPNumber" }         //F7
-                        , { field: 'HSPName', title: '浠撲綅鍚嶇О', width: 100, hide: true, style: 'background:  ' + disabled_color }
+                        , { field: 'HSPNumber', title: '浠撲綅浠ｇ爜', width: 100, edit: 'text', event: "HSPNumber" }         //F7
+                        , { field: 'HSPName', title: '浠撲綅鍚嶇О', width: 100, style: 'background:  ' + disabled_color }
                         , { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true, style: 'background:  ' + disabled_color }
-                        , { field: 'HSCWHNumber', title: '璋冨嚭浠撳簱浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HWHNumber" }   //F7
+                        , { field: 'HSCWHNumber', title: '璋冨嚭浠撳簱浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSCWHNumber" }   //F7
                         , { field: 'HSCWHName', title: '璋冨嚭浠撳簱鍚嶇О', width: 100, hide: true, style: 'background:  ' + disabled_color }
                         , { field: 'HSCSPID', title: 'HSCSPID', width: 100, hide: true, style: 'background:  ' + disabled_color }
-                        , { field: 'HSCSPNumber', title: '璋冨嚭浠撲綅浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSPNumber" }         //F7
+                        , { field: 'HSCSPNumber', title: '璋冨嚭浠撲綅浠ｇ爜', width: 100, hide: true, edit: 'text', event: "HSCSPNumber" }         //F7
                         , { field: 'HSCSPName', title: '璋冨嚭浠撲綅鍚嶇О', width: 100, hide: true, style: 'background:  ' + disabled_color }
                         , { field: 'HSourceInterID', title: 'HSourceInterID', width: 100, hide: true, style: 'background:  ' + disabled_color }
                         , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 100, hide: true, style: 'background:  ' + disabled_color }
@@ -1136,7 +1142,6 @@
                             if (checkStatus.data[i]["HSupTypeID"] != HSupTypeID_Temp) {
                                 var err = "鎵�閫夊崟鎹搴斿線鏉ョ被鍨嬪繀椤讳竴鑷达紒";
                                 layer.alert(err, { icon: 5 });
-                                layer.close(index);
                                 return;
                             }
                         }
@@ -1147,6 +1152,8 @@
                             if (temp != "none") {
                                 dataArray.push(temp);
                             } else {
+                                var err = "鏈煡璇㈠埌婧愬崟淇℃伅锛岃鍒锋柊婧愬崟鍒楄〃鍚庨噸鏂伴�夋嫨瀵瑰簲婧愬崟锛�";
+                                layer.alert(err, { icon: 5 });
                                 return;
                             }
                         }
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/Add_Edit_Gy_QCVerificationBill.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/Add_Edit_Gy_QCVerificationBill.html"
new file mode 100644
index 0000000..bfc4419
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Add_Edit_Gy_QCVerificationBill.html"
@@ -0,0 +1,1126 @@
+锘�<!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/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/common.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+        /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius"
+                                        lay-submit="" lay-filter="Saver">
+                                    淇濆瓨
+                                </button>
+                                <button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius"
+                                        lay-submit="" lay-filter="Checker">
+                                    瀹℃牳
+                                </button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
+                                        lay-filter="Exit">
+                                    閫�鍑�
+                                </button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>鍣ㄥ叿鏍￠獙璁板綍鍗�</b></h1>
+                                <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>
+                                    <li lay-id="3" style="padding:1px;">鍒跺崟淇℃伅</li>
+                                </ul>
+                                
+                                <div class="layui-tab-content">
+                                    <!--鍩烘湰淇℃伅-->
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo"
+                                                           id="HBillNo" readonly="readonly" autocomplete="off">
+                                                    <input id="HInterID" name="HInterID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDate" id="HDate"
+                                                           autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd"
+                                                           placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HInnerBillNo" id="HInnerBillNo"
+                                                           class="layui-input">
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="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;">
+                                                    <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="Department" 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 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-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;">缁勭粐:</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 501px;" readonly>
+                                                    <select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" disabled>
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--闄勪欢淇℃伅-->
+                                    <div class="layui-tab-item">
+                                        <div class="layui-form-item" style="padding-top: 10px;">
+                                            <div class="layui-upload">
+                                                <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                                <div class="layui-upload-list">
+                                                    <table class="layui-table" lay-filter="fileTable">
+                                                        <thead>
+                                                            <tr>
+                                                                <th>鏂囦欢鍚�</th>
+                                                                <th>鏂囦欢绫诲瀷</th>
+                                                                <th>澶у皬</th>
+                                                                <th>鐘舵��</th>
+                                                                <th>鎿嶄綔</th>
+                                                            </tr>
+                                                        </thead>
+                                                        <tbody id="ProImgByList" class="ProImgByList">
+                                                        </tbody>
+                                                    </table>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!--鍒跺崟淇℃伅-->
+                                    <div class="layui-tab-item">
+                                        <div class="layui-form-item">
+                                            <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 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>
+                                        <div class="layui-form-item">
+                                            <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 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>
+                                        <div class="layui-form-item">
+                                            <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 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>
+
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">妫�楠岄」淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>                              
+                            </div>
+                        </div>
+
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao1">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                    </form>
+                </div>
+            </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 type="text/html" id="HHCalibrationStatus">
+        <select name="HHCalibrationStatus" lay-filter="HHCalibrationStatus" id="HHCalibrationStatus{{d.LAY_TABLE_INDEX+1}}">
+            <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+            <option value="鍚堟牸" selected>鍚堟牸</option>
+        </select>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        var optionData = []
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , upload = layui.upload
+                , element = layui.element;
+            var option = [];
+            var sBillType = "3321";
+            var HModName = "Add_Edit_Gy_QCVerificationBill"
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3321";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            //璁板綍缁勭粐鐨勫��
+            var HOrgIDBar = 0;
+            $("#HOrgID").prop("disabled", true);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+                //鏂囦欢閫夋嫨鍒濆鍖�
+                PicUpload();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditForm(linterid);
+                //鏂囦欢閫夋嫨鍒濆鍖�
+                PicUpload();
+                getFile();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+
+            //#region 鍒濆鍖栫粍缁�
+            Organ();
+            //#endregion
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛�
+
+            //琛岄�夋嫨澶勭悊锛堢姸鎬侊級
+            form.on('select(HHCalibrationStatus)', 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.HHCalibrationStatus = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+                console.log(table.cache["mainTable"]);
+            });
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+
+                var NewRow = { "HInspectInstruMentID": 0, "HInspectInstruMentNumber": "", "HInspectInstruMentName": "  ", "HBeginDate": Format(new Date(), 'yyyy-MM-dd'), "HEndDate": Format(new Date(), 'yyyy-MM-dd'), "HHCalibrationStatus": "鍚堟牸" };
+                switch (obj.event) {
+                    case 'btn-AddLine':
+                        table.cache["mainTable"].push(NewRow);
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HHCalibrationStatus' + i + '').find("option[value='" + option.data[i - 1].HHCalibrationStatus + "']").attr("selected", true);
+                        }
+
+                        form.render('select');
+                        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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            CheckedSet_tableSub();
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HHCalibrationStatus' + i + '').find("option[value='" + option.data[i - 1].HHCalibrationStatus + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                        }
+                        break;
+                    case 'set_HideColumn': get_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
+                        break;
+                }
+            });
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+                var data = obj.data;
+                //鐢熶骇鏃ユ湡
+                if (obj.event == 'HProduceDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            var index = obj.tr.data('index');
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            $('#HHCalibrationStatus' + (index + 1)).find("option[value='" + data.HHCalibrationStatus + "']").attr("selected", true);
+                            form.render('select');
+                        }
+                    });
+                }
+
+                //淇濊川鏈熻嚦
+                if (obj.event == 'HExpiryDate') {
+                    var field = $(this).data('field');
+                    laydate.render({
+                        elem: this.firstChild
+                        , show: true //鐩存帴鏄剧ず
+                        , closeStop: this
+                        , done: function (nowDate) {
+                            var index = obj.tr.data('index');
+                            //鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
+                            data[field] = nowDate;
+                            obj.update(data);
+                            $('#HHCalibrationStatus' + (index + 1)).find("option[value='" + data.HHCalibrationStatus + "']").attr("selected", true);
+                            form.render('select');
+                        }
+                    });
+                }
+            });
+          
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+            form.on('submit(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+            //琛ㄥご淇℃伅鑱屽憳寮圭獥
+            form.on('submit(HEmpList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
+                //瀵规暟鎹繘琛岄獙璇�
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_QCVerificationBillMain/SaveGetGy_QCVerificationBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    });
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+            //#region 褰撳墠椤甸潰鎵�鏈夋柟娉�
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                let unEditableColStyle = 'background-color: #eeeeee;'
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", style: unEditableColStyle }
+                    , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', edit: 'text', hide: true }
+                    , { field: 'HInspectInstruMentNumber', title: '鍣ㄥ叿浠ｇ爜', edit: 'text', event: "HInspectInstruMentID" }
+                    , { field: 'HInspectInstruMentName', title: '鍣ㄥ叿鍚嶇О', style: unEditableColStyle }
+                    , { field: 'HBeginDate', title: '鐢熸晥鏃ユ湡', event: 'HProduceDate' }
+                    , { field: 'HEndDate', title: '澶辨晥鏃ユ湡', event: 'HExpiryDate' }
+                    , { field: 'HHCalibrationStatus', title: '鏍″噯鐘舵��', templet: '#HHCalibrationStatus' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text'}                    
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                        //initDatePicker();
+                    }
+                };
+            }
+
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [{ "HInspectInstruMentID": 0, "HInspectInstruMentNumber": "", "HInspectInstruMentName": "  ", "HBeginDate": Format(new Date(), 'yyyy-MM-dd'), "HEndDate": Format(new Date(), 'yyyy-MM-dd'), "HHCalibrationStatus": "鍚堟牸" }];
+                table.render(option);
+            }
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    async: false,
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
+           
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {                
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_QCVerificationBillMain/Gy_QCVerificationBillDetail",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Gy_QCVerificationBillMain_Edit[0];
+                            var tableSub = result.data.h_v_Gy_QCVerificationBillMain_Edit
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": linterid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HDeptID": data.HDeptID
+                                , "HDeptName": data.閮ㄩ棬
+
+                                , "HEmpID": data.HCheckEmp
+                                , "HEmpName": data.璐ㄦ鍛�
+
+                                , "HMaker": data.鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : Format(new Date(data.鍒跺崟鏃ユ湡), "yyyy-MM-dd")
+                                , "HChecker": data.瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
+                                , "HUpDater": data.淇敼浜�
+                                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : Format(new Date(data.淇敼鏃ユ湡), "yyyy-MM-dd")
+                                , "HCloseMan": data.鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
+                                , "HDeleteMan": data.浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
+                            });
+                            //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+                            HOrgIDBar = data.HOrgID;
+
+                            var rowdata = [];
+                            for (var i = 0; i < tableSub.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HInspectInstruMentID": tableSub[i].HInspectInstruMentID, "HInspectInstruMentNumber": tableSub[i].鍣ㄥ叿浠ｇ爜, "HInspectInstruMentName": tableSub[i].鍣ㄥ叿鍚嶇О,
+                                        "HBeginDate": tableSub[i].鐢熸晥鏃ユ湡, "HEndDate": tableSub[i].澶辨晥鏃ユ湡,
+                                        "HHCalibrationStatus": tableSub[i].鏍″噯鐘舵��, "HRemark": tableSub[i].瀛愬娉�
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                            for (var i = 0; i < option.data.length; i++) {
+                                $('#HHCalibrationStatus' + (i + 1)).find("option[value='" + option.data[i].HHCalibrationStatus + "']").attr("selected", true);
+                            }
+                            form.render('select');
+
+                            if (isEmpty(data.瀹℃牳浜�) == false) {
+                                //$("#Saver").addClass('layui-btn-disabled').attr('disabled', true)
+                            } else {
+                                $("#check-btn").removeClass('layui-btn-disabled').attr('disabled', false)
+                            }
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+            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_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 {
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1)
+                            option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+                            table.render(option);
+                            for (var i = 0; i < oldData.length; i++) {
+                                $('#HHCalibrationStatus' + (i + 1)).find("option[value='" + oldData[i].HHCalibrationStatus + "']").attr("selected", true);
+                            }
+                            form.render('select');
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+
+            //琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HInspectInstruMentID')  //
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '浠櫒鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    else if (checkStatus.data.length === 1) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            HInspectInstruMentID: checkStatus.data[0].hmainid,
+                                            HInspectInstruMentNumber: checkStatus.data[0].妯″叿缂栧彿,
+                                            HInspectInstruMentName: checkStatus.data[0].妯″叿鍚嶇О,
+                                        });
+                                    } else {
+
+
+                                        //(澶氶�夎)
+                                        //灏嗗師鏈夎〃浣撴暟鎹啓鍏ユ暟缁�
+                                        var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < tableBak.length; i++) {
+                                            if (tableBak[i]["HInspectInstruMentID"] != 0 && tableBak[i]["HInspectInstruMentID"] != "" && tableBak[i]["HInspectInstruMentID"] != undefined && tableBak[i]["HInspectInstruMentID"] != null) {
+                                                buttonArr.push(tableBak[i]);  //濡傛灉鍏抽敭瀛楁涓嶄负绌猴紝鍒欏皢涔嬪墠鐨勬暟鎹瓨鍌�
+                                            }
+                                        }
+                                        //灏嗘壒閲忛�夋嫨鐨勬暟鎹啓鍏ユ暟缁勶紙澶氶�夎锛�
+                                        for (var i = 0; i < checkStatus.data.length; i++) {
+                                            buttonArr.push({
+                                                "HInspectInstruMentID": checkStatus.data[i].hmainid,
+                                                "HInspectInstruMentNumber": checkStatus.data[i].妯″叿缂栧彿,
+                                                "HInspectInstruMentName": checkStatus.data[i].妯″叿鍚嶇О,
+                                                "HBeginDate": Format(new Date(), 'yyyy-MM-dd'),
+                                                "HEndDate": Format(new Date(), 'yyyy-MM-dd'),
+                                                "HHCalibrationStatus": "鍚堟牸"
+                                            });
+                                        }
+                                        option.data = buttonArr;
+                                        table.render(option);
+                                        for (var i = 0; i < option.data.length; i++) {
+                                            $('#HHCalibrationStatus' + (i + 1)).find("option[value='" + option.data[i].HHCalibrationStatus + "']").attr("selected", true);
+                                        }
+                                        form.render('select');
+                                    }
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                    if (isEmpty(optionData) === false) {
+                                        obj.update({
+                                            HInspectInstruMentID: optionData[0].hmainid,
+                                            HInspectInstruMentNumber: optionData[0].妯″叿缂栧彿,
+                                            HInspectInstruMentName: optionData[0].妯″叿鍚嶇О,
+                                        })
+                                        optionData = []
+                                    }
+                                }
+                            });
+                        }
+
+                        //娓呯┖缂撳瓨
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            }
+
+
+
+            //瀹℃牳
+            form.on('submit(Checker)', function () {
+                var InterID = $("#HInterID").val();
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_QCVerificationBillMain/AuditQCVerificationBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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);
+                                $("#check-btn").addClass('layui-btn-disabled').attr('disabled', true)
+                                $("#add-btn").addClass('layui-btn-disabled').attr('disabled', true)
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                window.location.reload();
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            })
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var Organization = '';
+                            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);
+                            if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                            }
+                            $("#HOrgID").val(HOrgIDBar);
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#region 鏂囦欢涓婁紶
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
+
+                        , url: GetWEBURL() + "/Gy_QCVerificationBillMain/UploadFile_Gy_QCVerification"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                // 鎻愬彇鏂囦欢鍚庣紑
+                                var fileExt = getFileExtension(file.name);
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + fileExt + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
+
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
+
+                                ProImgByList.append(tr);
+
+                            });
+                        }
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
+            //#endregion
+
+            //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+            function getFile() {
+                var ProImgByList = $('#ProImgByList')
+                $.ajax({
+                    url: GetWEBURL() + 'Gy_QCVerificationBillMain/Gy_QCVerification_Filelist',
+                    type: "GET",
+                    data: { "HBillNo": $("#HBillNo").val() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var index = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                // 鎻愬彇鏂囦欢鍚庣紑
+                                var fileExt = getFileExtension(data1.data[0].HFileName);
+                                var tr = $(['<tr id="upload-' + i + '">'
+                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+                                    , '<td>' + data1.data[i].HFileName + '</td>'
+                                    , '<td>' + fileExt + '</td>'
+                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                $('#ProImgByList').append(tr);
+                            }
+
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+
+            //#region 鎻愬彇鏂囦欢鍚庣紑鐨勫伐鍏峰嚱鏁�
+            function getFileExtension(filename) {
+                if (!filename) return '鏈煡绫诲瀷';
+                var lastDotIndex = filename.lastIndexOf('.');
+                if (lastDotIndex === -1) return '鏃犲悗缂�'; // 娌℃湁鍚庣紑
+                return filename.substring(lastDotIndex + 1).toLowerCase(); // 杩斿洖灏忓啓鍚庣紑
+            }
+             //#endregion
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+
+       
+
+        //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+        function dowload(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+            /*window.location.href = url;*/
+            window.open(url)
+        }
+        //#endregion
+
+        //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+        function toManager(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+            var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+            var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+            var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+                //鍒犻櫎宸蹭笂浼犳枃浠�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_QCVerificationBillMain/Gy_QCVerification_DeleteFilelist',
+                    type: "GET",
+                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message, { icon: 1 });
+                            $("#ProImgByList tr").eq((rows - 1)).remove();
+                        }
+                        else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+        }
+        //#endregion
+      
+
+        //#region 鏁版嵁楠岃瘉
+        function AllowLoadData(sSubStr) {
+
+
+            if ($("#HDeptName").val() == '') {
+                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+
+            if ($("#HEmpName").val() == '') {
+                layer.msg("璐ㄦ鍛樻病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+
+
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            else
+                return true
+        }
+        //#endregion
+
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDeptID").val(obj[0].HItemID);//缁翠慨閮ㄩ棬id
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);//缁翠慨閮ㄩ棬鍚嶇О
+        }
+        function GetHEmpValue(obj) {  //杩斿洖鑱屽憳浜�
+            $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HEmpID").val(obj[0].HItemID);
+        }
+        function GetMouldFileValue(obj) {  //杩斿洖鑱屽憳浜�
+            optionData = obj;
+        }
+        
+    </script>
+
+</body>
+
+</html>
\ No newline at end of file
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/BatchGen_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/BatchGen_MouldFile.html"
index 8f70098..4261e62 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/BatchGen_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/BatchGen_MouldFile.html"
@@ -91,7 +91,7 @@
                     type: "Get",
                     url: GetWEBURL() + "/Gy_Mould/SaveBatchGen_MouldFile",
                     async: true,
-                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum },
+                    data: { "HInterID": linterid, "StarNum": StarNum, "EndNum": EndNum, "user": sessionStorage["HUserName"] },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) {
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_MaterialMouldBillMainList.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_MaterialMouldBillMainList.html"
index 1091137..806c772 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_MaterialMouldBillMainList.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_MaterialMouldBillMainList.html"
@@ -207,7 +207,7 @@
             var HModName = "Gy_MaterialMouldBillMainList";
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HInterID", "HEntryID", "HBillStatus", "HOrgID", "HDeptID", "HWorkCenterID", "HEquipID", "HMouldID", "HEmpID", "HMaterID"];
+            var titleData = ["HInterID", "HEntryID", "HBillStatus", "HOrgID", "HDeptID", "HWorkCenterID", "HEquipID", "HMouldID", "HEmpID", "HMaterID","鍗曟嵁绫诲瀷","HProcID"];
             var ins; //鐢ㄤ簬瀵煎嚭excel
             var HBillType = "3333";
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
@@ -320,6 +320,28 @@
                 });
             })
             //#endregion
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.HInterID;
+
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '浜у搧鍣ㄥ叿娓呭崟-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MaterialMouldBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: ['纭畾'],
+                        // 鎸夐挳1 鐨勫洖璋�
+                        end: function (index, layero, that) {
+                            //鍒锋柊椤甸潰
+                            get_FastQuery();
+                        }
+                    })
+                }
+            });
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -434,6 +456,12 @@
                                 }
                                 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: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
                                 }
                                 else {
                                     switch (data[i].Type) {
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 75427ba..1e088a6 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"
@@ -22,464 +22,540 @@
 
         .layui-form-select .layui-input {
             padding-right: 0px;
-        }
-        /*.table-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: 2px;background-color: #efefef;">
-            <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div style="padding: 10px;">
-                        <button type="button" id="btnSave" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
-                        <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="margin-left: 0px" lay-filter="Exit">閫�鍑�</button>
-                    </div>
-                    <div class="layui-tab" lay-filter="tab-POStockInBill">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
-                        </ul>
-                        <div class="layui-tab-content">
-                            <!--鍩烘湰淇℃伅-->
-                            <div class="layui-tab-item layui-show">
-                                <div class="layui-form-item" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
-                                                <input type="hidden" name="HInterID" id="HInterID">
-                                            </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="HDate" id="HDate" readonly>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline" style="margin-left:10px;">
-                                            <label class="layui-form-label">璐т富绫诲瀷</label>
-                                            <div class="layui-input-block">
-                                                <select name="HMouldOWNER" lay-filter="HMouldOWNER" id="HMouldOWNER">
-                                                    <option value="鑷垂" selected="selected">鑷垂</option>
-                                                    <option value="瀹緵">瀹緵</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo">
-                                            </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;">
-                                                <input type="text" class="layui-input" name="HName" id="HName">
-                                            </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;">
-                                                <input type="text" class="layui-input" name="HModel" id="HModel">
-                                            </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="HModel2" id="HModel2">
-                                            </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="HDiameter" id="HDiameter">
-                                            </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="HSubjoin" id="HSubjoin">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��2</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2">
-                                            </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="HPICNo" id="HPICNo">
-                                            </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="HWorkMaterModel" id="HWorkMaterModel">
-                                            </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="HMouldLength" id="HMouldLength">
-                                            </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="HMouldWidth" id="HMouldWidth">
-                                            </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="HMouldHeight" id="HMouldHeight">
-                                            </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="HMouldFoldHeight" id="HMouldFoldHeight">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <div class="layui-input-block" style="margin-left: 90px;">
-                                                <input type="checkbox" name="checkboxHTransPackFlag" id="checkboxHTransPackFlag" lay-skin="primary" lay-filter="checkboxHTransPackFlag" checked title="鏄惁鍛ㄨ浆瀹瑰櫒鏍囪">
-                                                <input type="hidden" value="true" name="HTransPackFlag" id="HTransPackFlag" lay-verify="HTransPackFlag">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <div class="layui-input-block" style="margin-left: 150px;">
-                                                <input type="checkbox" name="checkboxHSendPackFlag" id="checkboxHSendPackFlag" lay-skin="primary" lay-filter="checkboxHSendPackFlag" checked title="鏄惁鍙戣揣瀹瑰櫒鏍囪">
-                                                <input type="hidden" value="true" name="HSendPackFlag" id="HSendPackFlag" lay-verify="HSendPackFlag">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍑哄巶鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HOutComDate" id="HOutComDate">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鍑哄巶缂栧彿</label>
-                                            <div class="layui-input-block" style="margin-left: 125px;">
-                                                <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" />
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 80px;">
-                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline" style="margin-left:10px;">
-                                            <label class="layui-form-label">鍣ㄥ叿鐘舵��</label>
-                                            <div class="layui-input-block">
-                                                <select name="HMouldStatus" lay-filter="HMouldStatus" id="HMouldStatus">
-                                                    <option value="鍦ㄥ簱" selected="selected">鍦ㄥ簱</option>
-                                                    <option value="涓婃満">涓婃満</option>
-                                                    <option value="鍑哄簱">鍑哄簱</option>
-                                                    <option value="鍦ㄩ��">鍦ㄩ��</option>
-                                                    <option value="涓㈠け">涓㈠け</option>
-                                                    <option value="閿佸畾">閿佸畾</option>
-                                                    <option value="棰嗗嚭">棰嗗嚭</option>
-                                                    <option value="鎶ュ簾">鎶ュ簾</option>
-                                                    <option value="鏈惎鐢�">鏈惎鐢�</option>
-                                                    <option value="浣滃簾">浣滃簾</option>
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <div 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="HSaveLife" id="HSaveLife" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鐗堟湰鍙�</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HVersion" id="HVersion">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿宸ヨ壓璺嚎</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
-                                    </div>
-                                    <div class="layui-row">
+<body><div class="layui-fluid" style="padding: 0;">
+    <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+        <div class="layui-card-body" style="padding: 1px;">
+            <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                <div style="padding: 10px;">
+                    <button type="button" id="btnSave" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                    <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="margin-left: 0px" lay-filter="Exit">閫�鍑�</button>
+                    <button type="button" id="btn-Audit" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-Audit">瀹℃牳</button>
+                    <button type="button" id="btn-DeAudit" class="layui-btn layui-btn-normal" style="margin-left: 0px" lay-submit="" lay-filter="btn-DeAudit">鍙嶅鏍�</button>
+                </div>
 
-                                        <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅缁�</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
+                <div class="layui-tab" lay-filter="tab-POStockInBill">
+                    <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>
+                        <li lay-id="3" style="padding:1px;">鐢熶骇</li>
+                        <li lay-id="4" style="padding:1px;">浠撳簱灞炴��</li>
+                        <li lay-id="5" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        <li lay-id="6" style="padding:1px;">闄勪欢淇℃伅</li>
+                        <li lay-id="7" style="padding:1px;">鍒跺崟淇℃伅</li>
+                    </ul>
 
-                                    </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="HDesignLife" id="HDesignLife">
-                                            </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="HUseLife" id="HUseLife" value="0" 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="HLeaveLife" id="HLeaveLife" value="0" readonly>
-                                            </div>
+                    <div class="layui-tab-content">
+                        <!--椤电1锛氬熀鏈俊鎭�-->
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo" readonly>
+                                            <input type="hidden" name="HInterID" id="HInterID">
                                         </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="HProdQty" id="HProdQty" value="0" 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="HProdWeight" id="HProdWeight" value="0" readonly>
-                                            </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;">
-                                                <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty">
-                                            </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="HDate" id="HDate" readonly>
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿淇濆吇瑙勭▼<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">鏉＄爜缂栧彿<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBarCode" id="HBarCode">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍒堕�犲巶鍟�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMadeSupName" id="HMadeSupName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMadeSupID" id="HMadeSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMadeSup" id="btnHMadeSup" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <!--<div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">铏氭嫙浠�<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HNowSupName" id="HNowSupName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HNowSupID" id="HNowSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HNowSupList" id="HNowSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>-->
-                                    </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">涓嬫淇濆吇/鏍℃鏃ユ湡</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline" style="margin-left:10px;">
-                                            <label class="layui-form-label">鍣ㄥ叿绫诲瀷</label>
-                                            <div class="layui-input-block">
-                                                <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
-                                                    <option value="妯″叿" selected="selected">妯″叿</option>
-                                                    <option value="宸ヨ">宸ヨ</option>
-                                                    <option value="澶瑰叿">澶瑰叿</option>
-                                                    <option value="鍒�鍏�">鍒�鍏�</option>
-                                                    <option value="妫�鍏�">妫�鍏�</option>
-                                                    <option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</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;">
-                                                <input type="text" class="layui-input" name="HInitLife" id="HInitLife" value="0">
-                                            </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;">
+                                            <input type="text" class="layui-input" name="HBarCode" id="HBarCode" value="">
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撳簱</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撲綅</label>
-                                            <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
-                                                <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline" style="margin-left:10px;">
-                                            <label class="layui-form-label">鍣ㄥ叿鍙敤鐘舵��</label>
-                                            <div class="layui-input-block">
-                                                <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus" disabled>
-                                                    <option value="姝ｅ父" selected="selected">姝ｅ父</option>
-                                                    <option value="寮傚父">寮傚父</option>
-                                                    <option value="淇濆吇">淇濆吇</option>
-                                                    <option value="缁翠慨">缁翠慨</option>
-                                                </select>
-                                            </div>
+                                </div>
+
+                                <div class="layui-row" style="margin-top:10px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍣ㄥ叿缂栧彿<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" value="">
                                         </div>
                                     </div>
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;">浣跨敤缁勭粐</label>
-                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
-                                                <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
-                                                <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
-                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
-                                                </select>
-                                            </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;">
+                                            <input type="text" class="layui-input" name="HName" id="HName" value="">
+                                        </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="HModel" id="HModel" value="">
+                                        </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="HModel2" id="HModel2" value="">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px">
+                                    <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="HOutComDate" id="HOutComDate">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍑哄巶缂栧彿</label>
+                                        <div class="layui-input-block" style="margin-left: 125px;">
+                                            <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" />
+                                        </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;">
+                                            <input type="text" class="layui-input" lay-verify="HCalibrationDate" name="HCalibrationDate" id="HCalibrationDate">
+                                        </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;">
+                                            <input type="text" class="layui-input" lay-verify="HNextMainDate" name="HNextMainDate" id="HNextMainDate">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鏍″噯鍛ㄦ湡<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" lay-verify="HCalibrationCycle" name="HCalibrationCycle" id="HCalibrationCycle" value="">
+                                        </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="HProductDesignSize" name="HProductDesignSize" id="HProductDesignSize" value="">
+                                        </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="HGaugeDesignSize" name="HGaugeDesignSize" id="HGaugeDesignSize" value="">
+                                        </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="HProductQTY" name="HProductQTY" id="HProductQTY" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤浜�</label>
+                                        <div class="layui-input-block" style="margin-left: 80px;">
+                                            <input type="text" class="layui-input" name="HUserName" id="HUserName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HUserID" id="HUserID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUserList" id="btnHUserList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍝佺墝</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" lay-verify="HBrand" name="HBrand" id="HBrand" value="">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="margin-left:10px;">
+                                        <label class="layui-form-label">鏍″噯绫诲瀷</label>
+                                        <div class="layui-input-block">
+                                            <select name="HCalibrationType" lay-filter="HCalibrationType" id="HCalibrationType">
+                                                <option value="鍐呮牎" selected="selected">鍐呮牎</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;">
+                                            <input type="text" class="layui-input" lay-verify="HLocation" name="HLocation" id="HLocation" value="">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="margin-left:10px;">
+                                        <label class="layui-form-label">鍣ㄥ叿绫诲瀷</label>
+                                        <div class="layui-input-block">
+                                            <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
+                                                <option value="妯″叿" selected="selected">妯″叿</option>
+                                                <option value="宸ヨ">宸ヨ</option>
+                                                <option value="澶瑰叿">澶瑰叿</option>
+                                                <option value="鍒�鍏�">鍒�鍏�</option>
+                                                <option value="妫�鍏�">妫�鍏�</option>
+                                                <option value="閲忓叿">閲忓叿</option>
+                                                <option value="娌诲叿">娌诲叿</option>
+                                                <option value="鍛ㄨ浆鍣ㄥ叿">鍛ㄨ浆鍣ㄥ叿</option>
+                                                <option value="鍏朵粬">鍏朵粬</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="margin-left:10px;">
+                                        <label class="layui-form-label">鍣ㄥ叿鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select name="HMouldStatus" lay-filter="HMouldStatus" id="HMouldStatus">
+                                                <option value="鍦ㄥ簱" selected="selected">鍦ㄥ簱</option>
+                                                <option value="涓婃満">涓婃満</option>
+                                                <option value="鍑哄簱">鍑哄簱</option>
+                                                <option value="鍦ㄩ��">鍦ㄩ��</option>
+                                                <option value="涓㈠け">涓㈠け</option>
+                                                <option value="閿佸畾">閿佸畾</option>
+                                                <option value="棰嗗嚭">棰嗗嚭</option>
+                                                <option value="鎶ュ簾">鎶ュ簾</option>
+                                                <option value="鏈惎鐢�">鏈惎鐢�</option>
+                                                <option value="浣滃簾">浣滃簾</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div 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="HWorkMaterModel" id="HWorkMaterModel" value="">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-row" style="margin-top:10px">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 80px;">
+                                            <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline" style="margin-left:10px;">
+                                        <label class="layui-form-label">鍙敤鐘舵��</label>
+                                        <div class="layui-input-block">
+                                            <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
+                                                <option value="姝ｅ父" selected="selected">姝ｅ父</option>
+                                                <option value="杩囨湡">杩囨湡</option>
+                                                <option value="寮傚父">寮傚父</option>
+                                                <option value="淇濆吇">淇濆吇</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;">
+                                            <input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID">
+                                            <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+                                                <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                            </select>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                            <!--鍏朵粬淇℃伅-->
-                            <div class="layui-tab-item">
-                                <div class="layui-form-item">
+                        </div>
+
+                        <!--椤电2锛氬垎绫讳笌鐘舵��-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HSupName" id="HSupName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HSupID" id="HSupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍒堕�犲巶鍟�<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HMadeSupName" id="HMadeSupName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HMadeSupID" id="HMadeSupID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMadeSup" id="btnHMadeSup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿淇濆吇瑙勭▼<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HMouldMaintainRuleInterName" id="HMouldMaintainRuleInterName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HMouldMaintainRuleInterID" id="HMouldMaintainRuleInterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HMouldMaintainRuleInterList" id="HMouldMaintainRuleInterList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!--椤电3锛氱敓浜т笌ERP-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" value="0">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鍥惧彿</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HPICNo" id="HPICNo">
+                                        </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="HProdQty" id="HProdQty" value="0" 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="HProdWeight" id="HProdWeight" value="0" readonly>
+                                        </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;">
+                                            <input type="text" class="layui-input" name="HCaveQty" id="HCaveQty" value="0">
+                                        </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="HInitLife" id="HInitLife" value="0">
+                                        </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="HDesignLife" id="HDesignLife" value="0">
+                                        </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="HSaveLife" id="HSaveLife" value="0">
+                                        </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="HUseLife" id="HUseLife" value="0" 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="HLeaveLife" id="HLeaveLife" value="0" readonly>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!--椤电4锛氫粨搴撲笌灞炴��-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱<label style="color:red"> * </label></label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HWHName" id="HWHName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HWHID" id="HWHID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HSPName" id="HSPName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HSPID" id="HSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">鐗堟湰鍙�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HVersion" id="HVersion">
+                                        </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="HSubjoin" id="HSubjoin">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">杈呭姪灞炴��2</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HSubjoin2" id="HSubjoin2">
+                                        </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="HMouldFoldHeight" id="HMouldFoldHeight" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-row">
+
+                                    <div class="layui-inline">
+                                        <div class="layui-input-block" style="margin-left: 90px;">
+                                            <input type="checkbox" name="checkboxHTransPackFlag" id="checkboxHTransPackFlag" lay-skin="primary" lay-filter="checkboxHTransPackFlag" checked title="鏄惁鍛ㄨ浆瀹瑰櫒鏍囪">
+                                            <input type="hidden" value="true" name="HTransPackFlag" id="HTransPackFlag" lay-verify="HTransPackFlag">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <div class="layui-input-block" style="margin-left: 150px;">
+                                            <input type="checkbox" name="checkboxHSendPackFlag" id="checkboxHSendPackFlag" lay-skin="primary" lay-filter="checkboxHSendPackFlag" checked title="鏄惁鍙戣揣瀹瑰櫒鏍囪">
+                                            <input type="hidden" value="true" name="HSendPackFlag" id="HSendPackFlag" lay-verify="HSendPackFlag">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撳簱</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠浠撲綅</label>
+                                        <div class="layui-input-block" style="margin-left: 77px;">
+                                            <input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
+                                            <input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
+                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!--椤电5锛氬叾浠栦俊鎭�-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label" style="width: 85px;">闀�</label>
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="text" class="layui-input" name="HMouldLength" id="HMouldLength" value="0">
+                                        </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="HMouldWidth" id="HMouldWidth" value="0">
+                                        </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="HMouldHeight" id="HMouldHeight" value="0">
+                                        </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="HDiameter" id="HDiameter" value="0">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-row">
+                                   
+                                </div>
+
+                                <div class="layui-row">
+
+                                  
+                                </div>
+                            </div>
+                        </div>
+
+                        <!--椤电6锛氶檮浠朵俊鎭�-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-upload">
+                                    <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                    <div class="layui-upload-list">
+                                        <table class="layui-table" lay-filter="fileTable">
+                                            <thead>
+                                                <tr>
+                                                    <th>鏂囦欢鍚�</th>
+                                                    <th>鏂囦欢绫诲瀷</th>
+                                                    <th>澶у皬</th>
+                                                    <th>鐘舵��</th>
+                                                    <th>鎿嶄綔</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody id="ProImgByList" class="ProImgByList">
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <!--椤电7锛氬埗鍗曚俊鎭�-->
+                        <div class="layui-tab-item">
+                            <div class="layui-form-item" style="padding-top: 10px;">
+                                <div class="layui-row">
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
                                         <div class="layui-input-block" style="margin-left: 120px;">
@@ -504,9 +580,9 @@
                                             <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
                                         </div>
                                     </div>
-
                                 </div>
-                                <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;">
@@ -532,7 +608,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <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;">
@@ -549,51 +625,52 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-tab" lay-filter="tab-POStockInBill">
-                        <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li style="padding:1px;" class="layui-this">瀛愬櫒鍏�</li>
-                            <li style="padding:1px;">淇濆吇瑙勭▼</li>
-                            <li style="padding:1px;">鐐规瑙勭▼</li>
-                        </ul>
-                        <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-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>
-                                    </div>
-                                </script>
-                            </div>
-                            <div class="layui-tab-item ">
-                                <!--淇濆吇瑙勭▼璇︾粏-->
-                                <table class="layui-hide" id="mainTableMaintainRule" lay-filter="mainTableMaintainRule"></table>
-                                <script type="text/html" id="toolbarDemoMaintainRule">
-                                    <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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
-                                    </div>
-                                </script>
-                            </div>
-                            <div class="layui-tab-item">
-                                <!--鐐规瑙勭▼鍒楄〃-->
-                                <table class="layui-hide" id="mainTableDotCheckRule" lay-filter="mainTableDotCheckRule"></table>
-                                <script type="text/html" id="toolbarDemoDotCheckRule">
-                                    <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="set_HideColumn2"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
-                                    </div>
-                                </script>
-                            </div>
+                </div>
+
+                <!-- 瀛愯〃鍖哄煙锛堜繚鎸佸師鏍凤級 -->
+                <div class="layui-tab" lay-filter="tab-POStockInBill">
+                    <ul class="layui-tab-title" lay-filter="tab-all">
+                        <li style="padding:1px;" class="layui-this">瀛愬櫒鍏�</li>
+                        <li style="padding:1px;">淇濆吇瑙勭▼</li>
+                        <li style="padding:1px;">鐐规瑙勭▼</li>
+                    </ul>
+                    <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-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>
+                                </div>
+                            </script>
+                        </div>
+                        <div class="layui-tab-item ">
+                            <!--淇濆吇瑙勭▼璇︾粏-->
+                            <table class="layui-hide" id="mainTableMaintainRule" lay-filter="mainTableMaintainRule"></table>
+                            <script type="text/html" id="toolbarDemoMaintainRule">
+                                <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>
+                                </div>
+                            </script>
+                        </div>
+                        <div class="layui-tab-item">
+                            <!--鐐规瑙勭▼鍒楄〃-->
+                            <table class="layui-hide" id="mainTableDotCheckRule" lay-filter="mainTableDotCheckRule"></table>
+                            <script type="text/html" id="toolbarDemoDotCheckRule">
+                                <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>
+                                </div>
+                            </script>
                         </div>
                     </div>
-                </form>
-            </div>
+                </div>
+            </form>
         </div>
     </div>
+</div>
 
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -638,7 +715,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙ｆā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+        }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -646,6 +723,7 @@
                 , table = layui.table
                 , form = layui.form
                 , laydate = layui.laydate
+                , upload = layui.upload
                 , element = layui.element
                 , util = layui.util
                 ;
@@ -675,6 +753,8 @@
             //鍒濆鍖栬〃鍗曟彃浠�
             set_InitFrom();
 
+           
+
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 Stverf = "Add";
@@ -682,6 +762,8 @@
                 get_InitGrid();
                 set_AddFNew();
                 $("#HUSEORGID").attr("disabled", true);
+                //鏂囦欢閫夋嫨鍒濆鍖�
+                PicUpload();               
             } else if (OperationType == 2) {//鏃犳簮鍗�
                 Stverf = "Add";
                 get_InitGrid();
@@ -700,6 +782,8 @@
                 $("#HMouldNo").val("");
                 $("#HBarCode").val("");
                 $("#HUSEORGID").attr("disabled", true);
+                //鏂囦欢閫夋嫨鍒濆鍖�
+                PicUpload();
             }
             else if (OperationType == 3) {//缂栬緫
                 Stverf = "Update";
@@ -707,6 +791,9 @@
                 get_InitGrid();
                 set_EditFromGrid();
                 $("#HUSEORGID").attr("disabled", true);
+                //鏂囦欢閫夋嫨鍒濆鍖�
+                PicUpload();
+                getFile();
             }
             else {
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
@@ -718,6 +805,16 @@
             //淇濆瓨
             form.on('submit(btnSave)', function (data) {//鎻愪氦
                 set_btnSave(data);
+            })
+
+            //瀹℃牳
+            form.on('submit(btn-Audit)', function (data) {//鎻愪氦
+                set_CheckBill();
+            })
+
+            //鍙嶅鏍�
+            form.on('submit(btn-DeAudit)', function (data) {//鎻愪氦
+                set_AbandonCheck( );
             })
 
             //鑷姩璁＄畻鍓╀綑瀵垮懡
@@ -1309,6 +1406,45 @@
                 });
             });
 
+            //琛ㄥご淇℃伅閫夋嫨妫�楠屽憳寮圭獥
+            form.on('submit(btnHUserList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浣跨敤浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUserName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HUserID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+
             //铏氭嫙浠�
             form.on('submit(HNowSupList)', function () {
                 var typeid = $("#HNowSupTypeID").val();//鑾峰彇铏氭嫙浠撶被鍨�
@@ -1525,11 +1661,7 @@
                             //鍒锋柊澶嶉�夋
                             //checkRefresh();
                         }
-                        break;
-                    //鍒楄缃�
-                    //case 'set_hidecolumn':
-                    //    get_hidecolumn();
-                    //    break;
+                        break;                   
                 }
             });
             //鐐规瑙勭▼澶村伐鍏锋爮浜嬩欢
@@ -1649,6 +1781,12 @@
                 });
                 laydate.render({
                     elem: '#HOutComDate'
+                }); 
+                laydate.render({
+                    elem: '#HNextMainDate'
+                });
+                laydate.render({
+                    elem: '#HCalibrationDate'
                 });
             }
 
@@ -1750,6 +1888,8 @@
                 $("#HProdQty").val("0");     //宸茬敓浜ф暟閲忛粯璁�0
                 $("#HProdWeight").val("0");  //浠ョ敓浜ч噸閲忛粯璁�0
                 $("#HSPID").val("0");
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date, "yyyy-MM-dd"));
                 //鑾峰彇鏈�澶у崟鎹彿
                 get_MAXNum();
             }
@@ -1762,12 +1902,15 @@
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
+                    async: false,
                     data: { "HBillType": sBillType },
                     success: function (d) {
                         $("#HInterID").val(0);
                         $("#HBillNo").val(d.data[0].HBillNo);
                         $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                         $("#HOutComDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HCalibrationDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HNextMainDate").val(Format(new Date(new Date().setFullYear(new Date().getFullYear() + 1)), "yyyy-MM-dd"));
                     }
                 });
             }
@@ -1834,8 +1977,8 @@
                         $("#HMouldFoldHeight").val(d.data[0].鎶樺彔楂樺害);
                         $("#checkboxHTransPackFlag").prop("checked", d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1);    // 璁剧疆鍛ㄨ浆瀹瑰櫒鏍囪
                         $("#HTransPackFlag").val(d.data[0].鍛ㄨ浆瀹瑰櫒鏍囪 == 1 ? "true" : "false");
-                        $("#checkboxHSendPackFlag").prop("checked", d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1);     // 璁剧疆鍙戣揣瀹瑰櫒鏍囪  
-                        $("#HSendPackFlag").val(d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1 ? "true" : "false";
+                        $("#checkboxHSendPackFlag").prop("checked", d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1);     // 璁剧疆鍙戣揣瀹瑰櫒鏍囪
+                        $("#HSendPackFlag").val(d.data[0].鍙戣揣瀹瑰櫒鏍囪 == 1 ? "true" : "false");
                         layui.form.render('checkbox');                                                // 鏇存柊Layui鐨勬樉绀虹姸鎬侊紝鍔ㄦ�佹樉绀哄閫夋鐨勭姸鎬�
                         //$("#HRoutingID").val(d.data[0].HRoutingID);
                         //$("#HBomID").val(d.data[0].HBomID);
@@ -1869,6 +2012,16 @@
                         $("#HNowSPName").val(d.data[0].褰撳墠浠撲綅);
                         $("#HMouldUseStatus").val(d.data[0].妯″叿鍙敤鐘舵��);
                         $("#HNextMainDate").val(d.data[0].鏍℃鏃ユ湡);
+                        $("#HUserID").val(d.data[0].HUserID);
+                        $("#HUserName").val(d.data[0].浣跨敤浜�);
+                        $("#HBrand").val(d.data[0].鍝佺墝);
+                        $("#HCalibrationType").val(d.data[0].鏍″噯绫诲瀷);
+                        $("#HLocation").val(d.data[0].浣嶇疆);
+                        $("#HCalibrationDate").val(d.data[0].鏍″噯鏃ユ湡);
+                        $("#HCalibrationCycle").val(d.data[0].鏍″噯鍛ㄦ湡);
+                        $("#HProductDesignSize").val(d.data[0].浜у搧璁捐灏哄);
+                        $("#HGaugeDesignSize").val(d.data[0].妫�鍏疯璁″昂瀵�);
+                        $("#HProductQTY").val(d.data[0].浜у搧鏁伴噺);
 
                         $("#HUSEORGID").val(d.data[0].HUSEORGID);
                         $("#HMaker").val(d.data[0].鍒跺崟浜�);
@@ -2052,14 +2205,8 @@
                         success: function (data) {
                             if (data.count == 1) {
                                 layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    if (linterid == undefined) {
-                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
-                                    }
-                                    else {
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                                    }
-
+                                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                    $("#HInterID").val(data.HInterID);
                                 });
                             }
                             else {
@@ -2091,14 +2238,7 @@
                         success: function (data) {
                             if (data.code == 1) {
                                 layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    if (linterid == undefined) {
-                                        $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
-                                    }
-                                    else {
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                                    }
-
+                                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
                                 });
                             }
                             else {
@@ -2298,13 +2438,6 @@
             }
             //#endregion
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
 
             //#region 璁＄畻-涓嬫淇濆吇/鏍℃鏃ユ湡
             function calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
@@ -2350,8 +2483,241 @@
                     }
                 });
             }
+
+            //#region 鏂囦欢涓婁紶
+            function PicUpload() {
+                //澶氬浘鐗囦笂浼�
+                //澶氭枃浠跺垪琛ㄧず渚�
+                var ProImgByList = $('#ProImgByList')
+                    , uploadListIns = upload.render({
+                        elem: '#testList'
+
+                        , url: GetWEBURL() + "/Gy_MouldFileBillMain/UploadFile_Gy_MouldFilen"
+                        , accept: 'file'
+                        , multiple: true
+                        , auto: false
+                        //, bindAction: '#testListAction' //鎸夋壄缁戝畾
+                        , data: { "HBillNo": $("#HBillNo").val(), "HRemark": $("#HRemark").val(), "HUserName": sessionStorage["HUserName"] }
+                        , choose: function (obj) {
+                            var files = this.files = obj.pushFile(); //灏嗘瘡娆￠�夋嫨鐨勬枃浠惰拷鍔犲埌鏂囦欢闃熷垪
+                            //璇诲彇鏈湴鏂囦欢
+                            obj.preview(function (index, file, result) {
+                                // 鎻愬彇鏂囦欢鍚庣紑
+                                var fileExt = getFileExtension(file.name);
+                                var tr = $(['<tr id="upload-' + index + '">'
+                                    , '<td>' + file.name + '</td>'
+                                    , '<td>' + fileExt + '</td>'
+                                    , '<td>' + (file.size / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td>绛夊緟涓婁紶</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs demo-reload ">涓婁紶</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+
+                                //鍗曚釜閲嶄紶
+                                tr.find('.demo-reload').on('click', function () {
+                                    obj.upload(index, file);
+                                    return false;
+                                });
+
+                                //鍒犻櫎
+                                tr.find('.demo-delete').on('click', function () {
+                                    delete files[index]; //鍒犻櫎瀵瑰簲鐨勬枃浠�
+                                    tr.remove();
+                                    uploadListIns.config.elem.next()[0].value = ''; //娓呯┖ input file 鍊硷紝浠ュ厤鍒犻櫎鍚庡嚭鐜板悓鍚嶆枃浠朵笉鍙��
+                                });
+
+                                ProImgByList.append(tr);
+
+                            });
+                        }
+                        , done: function (res, index, upload) {
+                            if (res.code == 1) { //涓婁紶鎴愬姛
+                                var tr = ProImgByList.find('tr#upload-' + index)
+                                    , tds = tr.children();
+                                tds.eq(3).html('<span style="color: #5FB878;">涓婁紶鎴愬姛</span>');
+                                tds.eq(4).html(''); //娓呯┖鎿嶄綔
+
+                                return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
+                            }
+                            this.error(index, upload);
+                        }
+                        , error: function (index, upload) {
+                            var tr = ProImgByList.find('tr#upload-' + index)
+                                , tds = tr.children();
+                            tds.eq(2).html('<span style="color: #FF5722;">涓婁紶澶辫触[妫�鏌ユ枃浠跺悕鍙婃枃浠舵牸寮廬</span>');
+                            tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //鏄剧ず涓婁紶
+                        }
+                    });
+            }
             //#endregion
+
+            //#region 缂栬緫鏃�,鑾峰彇宸蹭笂浼犵殑鏂囦欢鍒楄〃
+            function getFile() {
+                var ProImgByList = $('#ProImgByList')
+                $.ajax({
+                    url: GetWEBURL() + 'Gy_MouldFileBillMain/Gy_MouldFilen_Filelist',
+                    type: "GET",
+                    data: { "HBillNo": $("#HBillNo").val() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var index = 0;
+                            for (var i = 0; i < data1.data.length; i++) {
+                                // 鎻愬彇鏂囦欢鍚庣紑
+                                var fileExt = getFileExtension(data1.data[0].HFileName);
+                                var tr = $(['<tr id="upload-' + i + '">'
+                                    , '<td style="display:none">' + data1.data[i].HItemID + '</td>'
+                                    , '<td style="display:none">' + data1.data[i].HSourceBillNo + '</td>'
+                                    , '<td>' + data1.data[i].HFileName + '</td>'
+                                    , '<td>' + fileExt + '</td>'
+                                    , '<td>' + (data1.data[i].HFileSize / 1014).toFixed(1) + 'kb</td>'
+                                    , '<td style="color: #5FB878;">涓婁紶鎴愬姛</td>'
+                                    , '<td style="display:none">' + data1.data[i].url + '</td>'
+                                    , '<td>'
+                                    , '<button class="layui-btn layui-btn-xs  demo-dowload" type="button" id="deltefile" onclick="javascript:dowload(this)"><i class="layui-icon layui-icon-download-circle layuiadmin-button-btn"></i>涓嬭浇</button>'
+                                    , '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete" type="button" id="deltefile" onclick="javascript:toManager(this)"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>鍒犻櫎</button>'
+                                    , '</td>'
+                                    , '</tr>'].join(''));
+
+                                $('#ProImgByList').append(tr);
+                            }
+
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鎻愬彇鏂囦欢鍚庣紑鐨勫伐鍏峰嚱鏁�
+            function getFileExtension(filename) {
+                if (!filename) return '鏈煡绫诲瀷';
+                var lastDotIndex = filename.lastIndexOf('.');
+                if (lastDotIndex === -1) return '鏃犲悗缂�'; // 娌℃湁鍚庣紑
+                return filename.substring(lastDotIndex + 1).toLowerCase(); // 杩斿洖灏忓啓鍚庣紑
+            }
+             //#endregion
+
+            //#endregion
+
+
+
+            //瀹℃牳
+            function set_CheckBill() {
+                var HInterID = $("#HInterID").val();
+                if (HInterID != 0) {
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁鏈繚瀛橈紝璇蜂繚瀛樺悗鍦ㄥ鏍革紒');
+                }
+                
+            }
+
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                var HInterID = $("#HInterID").val();
+                if (HInterID != 0) {
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('褰撳墠鍗曟嵁鏈繚瀛橈紝璇蜂繚瀛樺悗鍦ㄥ鏍革紒');
+                }                
+            }
+
         });
+
+
+        //#region 涓嬭浇宸蹭笂浼犵殑鏂囦欢
+        function dowload(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭浜斿垪鐨勫唴瀹�:鏂囦欢鍦板潃
+            var url = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(6)").html();
+            /*window.location.href = url;*/
+            window.open(url)
+        }
+        //#endregion
+
+        //#region 鍒犻櫎宸蹭笂浼犵殑鏂囦欢
+        function toManager(r) {
+            //寰楀埌褰撳墠鎵�鍦ㄨ
+            var rows = r.parentNode.parentNode.rowIndex;
+            //寰楀埌鎵�鍦ㄨ鐨勭涓�鍒楃殑鍐呭:涓婚敭ID
+            var HItemID = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(0)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭浜屽垪鐨勫唴瀹�:鍗曟嵁鍙�
+            var HSourceBillNo = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(1)").html();
+            //寰楀埌鎵�鍦ㄨ鐨勭涓夊垪鐨勫唴瀹�:鏂囦欢鍚嶇О
+            var HFileName = $("#ProImgByList tr:eq(" + (rows - 1) + ") td:eq(2)").html();
+            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+
+                //鍒犻櫎宸蹭笂浼犳枃浠�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_MouldFileBillMain/Gy_MouldFilen_DeleteFilelist',
+                    type: "GET",
+                    data: { "HItemID": HItemID, "HSourceBillNo": HSourceBillNo, "HFileName": HFileName },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.alert(data1.Message, { icon: 1 });
+                            $("#ProImgByList tr").eq((rows - 1)).remove();
+                        }
+                        else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            })
+        }
+        //#endregion
+
 
         function AllowLoadData() {  //闈炵┖楠岃瘉
             var Result = true;
@@ -2363,120 +2729,154 @@
                 layer.msg("鍣ㄥ叿鍚嶇О涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if ($("#HModel").val() == '' || $("#HModel").val() == null) {
-                layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
+            if (sessionStorage["OrganizationID"] == "100007") {
+                if ($("#HCalibrationCycle").val() == '' || $("#HCalibrationCycle").val() == null) {
+                    layer.msg("鏍″噯鍛ㄦ湡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                // 鏂板锛氭鏌ラ檮浠讹紙浠呭湪鏂板鏃舵鏌ワ級
+                if (Stverf == "Add") {  // 鏂板鏃堕渶瑕佹鏌ラ檮浠�
+                    // 妫�鏌ユ槸鍚︽湁涓婁紶鎴愬姛鐨勯檮浠�
+                    var hasAttachment = false;
+                    $("#ProImgByList tr").each(function () {
+                        // 妫�鏌ョ姸鎬佸垪鏄惁鍖呭惈"涓婁紶鎴愬姛"
+                        var statusText = $(this).find("td:eq(3)").text();  // 绗�4鍒楁槸鐘舵�佸垪
+                        if (statusText && statusText.indexOf("涓婁紶鎴愬姛") >= 0) {
+                            hasAttachment = true;
+                            return false; // 閫�鍑哄惊鐜�
+                        }
+
+                        // 鎴栬�呮鏌ユ槸鍚︽湁闅愯棌鐨凥ItemID锛堜粠鏈嶅姟鍣ㄨ幏鍙栫殑闄勪欢锛�
+                        var itemId = $(this).find("td:eq(0)").text();  // 绗�1鍒楁槸闅愯棌鐨凥ItemID
+                        if (itemId && itemId.trim() !== "") {
+                            hasAttachment = true;
+                            return false; // 閫�鍑哄惊鐜�
+                        }
+                    });
+
+                    if (!hasAttachment) {
+                        layer.msg("璇疯嚦灏戜笂浼犱竴涓檮浠讹紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
             }
-            if (!/^[1-9]\d*$/.test($("#HMouldLength").val())) {
-                layer.msg("闀匡細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
-                return Result = false;
-            }
-            if (!/^[1-9]\d*$/.test($("#HMouldWidth").val())) {
-                layer.msg("瀹� 锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
-                return Result = false;
-            }
-            if (!/^[1-9]\d*$/.test($("#HMouldHeight").val())) {
-                layer.msg("楂橈細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
-                return Result = false;
-            }
-            if (!/^[1-9]\d*$/.test($("#HMouldFoldHeight").val())) {
-                layer.msg("鎶樺彔楂樺害锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
-                return Result = false;
-            }
-            if ($("#HMouleTypeID").val() == '' || $("#HMouleTypeID").val() == null) {
-                layer.msg("鍣ㄥ叿鍒嗙被涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HUnitID").val() == '' || $("#HUnitID").val() == null) {
-                layer.msg("鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
-                layer.msg("浣跨敤閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
-                layer.msg("渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
-                layer.msg("榛樿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HCaveQty").val() == '' || $("#HCaveQty").val() == null) {
-                layer.msg("绌存暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            //if ($("#HNowSupID").val() == '' || $("#HNowSupID").val() == null) {
-            //    layer.msg("璇烽�夋嫨铏氭嫙浠擄紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            //    return Result = false;
-            //}
-            if ($("#HMouldMaintainRuleInterID").val() == '' || $("#HMouldMaintainRuleInterID").val() == null) {
-                layer.msg("璇烽�夋嫨榛樿淇濆吇瑙勭▼锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
-            if ($("#HMadeSupID").val() == '' || $("#HMadeSupID").val() == null) {
-                layer.msg("鍒堕�犲巶鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return Result = false;
-            }
+           
+            //鍑礉浠ヤ笅瀛楁涓嶆牎楠�
+            if (sessionStorage["OrganizationID"] != "100007" &&  sessionStorage["OrganizationID"] != "100038") {
+                if ($("#HModel").val() == '' || $("#HModel").val() == null) {
+                    layer.msg("鍣ㄥ叿瑙勬牸涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (!/^[1-9]\d*$/.test($("#HMouldLength").val())) {
+                    layer.msg("闀匡細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+                    return Result = false;
+                }
+                if (!/^[1-9]\d*$/.test($("#HMouldWidth").val())) {
+                    layer.msg("瀹� 锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+                    return Result = false;
+                }
+                if (!/^[1-9]\d*$/.test($("#HMouldHeight").val())) {
+                    layer.msg("楂橈細璇疯緭鍏ュぇ浜庨浂鐨勬暣鏁帮紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+                    return Result = false;
+                }
+                if (!/^[1-9]\d*$/.test($("#HMouldFoldHeight").val())) {
+                    layer.msg("鎶樺彔楂樺害锛氳杈撳叆澶т簬闆剁殑鏁存暟锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });    //浣跨敤姝ｅ垯琛ㄨ揪绀烘潵鍒ゆ柇鏄惁涓哄ぇ浜庨浂鐨勬暣鏁�
+                    return Result = false;
+                }
+                if ($("#HMouleTypeID").val() == '' || $("#HMouleTypeID").val() == null) {
+                    layer.msg("鍣ㄥ叿鍒嗙被涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HUnitID").val() == '' || $("#HUnitID").val() == null) {
+                    layer.msg("鍗曚綅涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+                    layer.msg("浣跨敤閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSupID").val() == '' || $("#HSupID").val() == null) {
+                    layer.msg("渚涘簲鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+                    layer.msg("榛樿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HCaveQty").val() == '' || $("#HCaveQty").val() == null) {
+                    layer.msg("绌存暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HMouldMaintainRuleInterID").val() == '' || $("#HMouldMaintainRuleInterID").val() == null) {
+                    layer.msg("璇烽�夋嫨榛樿淇濆吇瑙勭▼锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HMadeSupID").val() == '' || $("#HMadeSupID").val() == null) {
+                    layer.msg("鍒堕�犲巶鍟嗕笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+            }           
             return Result;
-            }
+        }
+        function GetHEmpValue(obj) {  //璐ㄦ鍛�
+            $("#HUserName").val(obj[0].鑱屽憳鍚嶇О);
+            $("#HUserID").val(obj[0].HItemID);
+        }
+        function GetGyMaterial(obj) {  //鐗╂枡
+            $("#HName").val(obj.鐗╂枡鍚嶇О);
+            $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+            $("#HMaterID").val(obj.HItemID);
+        }
 
-            function GetGyMaterial(obj) {  //鐗╂枡
-                $("#HName").val(obj.鐗╂枡鍚嶇О);
-                $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
-                $("#HMaterID").val(obj.HItemID);
-            }
+        function GetMouldTypeValue(obj) {  //鍣ㄥ叿鍒嗙被
+            $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
+            $("#HMouleTypeID").val(obj[0].HItemID);
+        }
 
-            function GetMouldTypeValue(obj) {  //鍣ㄥ叿鍒嗙被
-                $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
-                $("#HMouleTypeID").val(obj[0].HItemID);
-            }
+        function GetUnitValue(obj) {  //璁￠噺鍗曚綅
+            $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+            $("#HUnitID").val(obj[0].HItemID);
+        }
 
-            function GetUnitValue(obj) {  //璁￠噺鍗曚綅
-                $("#HUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
-                $("#HUnitID").val(obj[0].HItemID);
-            }
+        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+            $("#HDeptID").val(obj[0].HItemID);
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+        }
 
-            function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-                $("#HDeptID").val(obj[0].HItemID);
-                $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
-            }
+        function GetHSupNameValue(obj) {  //杩斿洖渚涘簲鍟�
+            $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
+            $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
+        }
 
-            function GetHSupNameValue(obj) {  //杩斿洖渚涘簲鍟�
-                $("#HSupID").val(obj[0].HItemID);//渚涘簲鍟唅d
-                $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
-            }
+        function GetHWHValue(obj) {  //浠撳簱
+            $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
+            $("#HWHID").val(obj[0].HItemID);
+        }
 
-            function GetHWHValue(obj) {  //浠撳簱
-                $("#HWHName").val(obj[0].浠撳簱鍚嶇О);
-                $("#HWHID").val(obj[0].HItemID);
-            }
+        function GetGyStockPlace(obj) {   //浠撲綅
+            $("#HSPName").val(obj.浠撲綅鍚嶇О);
+            $("#HSPID").val(obj.HMainID);
+        }
 
-            function GetGyStockPlace(obj) {   //浠撲綅
-                $("#HSPName").val(obj.浠撲綅鍚嶇О);
-                $("#HSPID").val(obj.HMainID);
-            }
+        function GetMouldMaintainRuleValue(obj) {   //淇濆吇瑙勭▼
+            $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
+            $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
+            OptionData = obj[0];
+        }
 
-            function GetMouldMaintainRuleValue(obj) {   //淇濆吇瑙勭▼
-                $("#HMouldMaintainRuleInterName").val(obj[0].鍗曟嵁鍙�);
-                $("#HMouldMaintainRuleInterID").val(obj[0].hmainid);
-                OptionData = obj[0];
-            }
+        function GetHAccSupNameValue(obj) {  //杩斿洖鍒堕�犲巶鍟�
+            $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HMadeSupID").val(obj[0].HItemID);
+        }
+        //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
+        function GetMouldFileValue(obj) {
+            OptionData = obj[0];
 
-            function GetHAccSupNameValue(obj) {  //杩斿洖鍒堕�犲巶鍟�
-                $("#HMadeSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
-                $("#HMadeSupID").val(obj[0].HItemID);
-            }
-            //瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
-            function GetMouldFileValue(obj) {
-                OptionData = obj[0];
-
-                HDataEmp = obj[0];
-            }
-            function GetMouldDotCheckRuleValue(obj) {
-                OptionData = obj[0];
-            }
+            HDataEmp = obj[0];
+        }
+        function GetMouldDotCheckRuleValue(obj) {
+            OptionData = obj[0];
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
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_MouldFileList.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_MouldFileList.html"
index 1935cc7..b006230 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_MouldFileList.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_MouldFileList.html"
@@ -214,6 +214,7 @@
             var sWhere = "";
             var option = [];
             var sql = "";
+            var titleData = ["hmainid", "HMouldTypeID", "HBillStatus", "褰撳墠浠撳簱ID", "褰撳墠浠撲綅ID", "HMaterID", "HMouldType", "HUnitID", "HDeptID", "HSupID", "HWhID", "HMouldMaintainRuleInterID", "HMouldDotCheckRuleInterID", "HSPID", "hsubid", "HBillType", "HMadeSupID", "HUserID","HUSEORGID"];
 
             var HModName = "Gy_MouldFileList"
             var HBillType = "3899";
@@ -244,8 +245,7 @@
 
                 //鍗曟嵁鍙疯秴閾炬帴
                 if (obj.event == '妯″叿缂栧彿') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
-                    var linterid = data.hmainid;
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    var linterid = data.hmainid;                  
                     layer.open({
                         type: 2
                         , area: ['100%', '100%']
@@ -260,7 +260,7 @@
                             location.reload();
                         }
                         , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                            
                         }
                     })
                 }
@@ -553,9 +553,58 @@
                     success: function (data1) {
                         option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
                         if (data1.code == 1) {
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if (data[i].name == '妯″叿缂栧彿') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妯″叿缂栧彿', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.妯″叿缂栧彿 + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , totalRow: true
+                                , height: 'full-50'
+                                , page: false //寮�鍚垎椤�
+                                , limit: 50
+                                , limits: [50, 500, 2000, 5000]
+                                , cols: [col]
+                                , data: data1.data
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            };
                             optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
-                            laypage.render(optionPage);
-                            option.data = data1.data;
+                            laypage.render(optionPage);                          
                             //鍒楄缃�
                             DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
                             ////鍒锋柊琛ㄦ牸鏁版嵁
@@ -829,11 +878,7 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
-                    var HInterID = data[0].hmainid.toString();
-                    //if (HBillStatus > 0) {
-                    //    layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
-                    //    return false;
-                    //}
+                    var HInterID = data[0].hmainid.toString();                   
                     //閫昏緫瀹℃牳鏂规硶
                     $.ajax({
                         type: "GET",
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_QCVerificationBillMain.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_QCVerificationBillMain.html"
new file mode 100644
index 0000000..9ca97ab
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_QCVerificationBillMain.html"
@@ -0,0 +1,1296 @@
+锘�<!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/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.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" id="HBeginDate"
+                                            style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                            style="width:190px;">
+                                    </div>
+                                </div>
+                                <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;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--鏄剧ず褰撳墠杩囨护鏂规-->
+                                <div class="layui-inline" style="margin-left:5px;">
+                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393"
+                                        id="HFilterScheme_Now"></div>
+                                </div>
+                                <div class="layui-colla-content">                                   
+                                    <div class="layui-row">
+                                        <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:5px">
+                                        <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:5px">
+                                        <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>
+                            <table class="" id="mainTable" lay-filter="mainTable"></table>
+                            
+                            <div id="page" style="position: relative; bottom: 0;"></div>
+                            <script type="text/html" id="toolbarDemo">
+                                <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                    <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                                </div>
+                            </script>
+                            <script type="text/html" id="xuhao">
+                                {{d.LAY_TABLE_INDEX+1}}
+                            </script>
+                            <script type="text/html" id="xuhao1">
+                                {{d.LAY_TABLE_INDEX+1}}
+                            </script>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+            // #region 鍏ㄥ眬鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , soulTable = layui.soulTable
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            var HBillType = "3321";
+            var HModName = "Gy_QCVerificationBillMain";
+            var titleData = ["hmainid", "鍗曟嵁ID", "鍗曟嵁绫诲瀷",  "HEmpID", "HDeptID",  "hsubid", "HRepairID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HBillType"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var page = 1;//鍒嗛〉鏁版嵁
+            var size = 50;
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鍣ㄥ叿鏍″噯璁板綍鍗�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+            //#endregion
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "3321";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            //#endregion
+
+            //鍒濆鍖栭〉闈㈠姞杞�
+            set_ClearBill();
+         
+
+            // 鑷畾涔夊伐鍏锋爮浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                let data = obj.data;
+                switch (obj.event) {
+                    case "onHBillNumberClickHandler": onHBillNumberClickHandler(data); break;
+                }
+            })
+
+            //#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 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀵煎嚭
+                    case 'btn-Export': get_Export();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                    //鍏抽棴鎸夐挳        锛�0:鍏抽棴銆�1:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(0);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(1);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
+                        break;                   
+                    //鎸夐挳璁剧疆
+                    case 'set_HideButton':
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+                        break;
+                    //淇濆瓨鏂规
+                    case 'set_SaveScheme': set_SaveScheme();
+                        break;
+                    //璇诲彇鏂规
+                    case 'set_ReadScheme': set_ReadScheme();
+                        break;
+                };
+            });
+
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                if (page != 1) {
+                    $("#page a:eq(1)").get(0).click();//鐐瑰嚮鍒嗛〉鏍忕涓�椤�
+                } else {
+                    get_FastQuery();
+                }
+            });
+
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //#region 鍙屽嚮杩斿洖鏁版嵁
+            table.on('rowDouble(mainTable)', function (obj) {
+                var data = [];
+                data.push(obj.data);
+                parent.Gy_QCVerificationValue(data);
+                var index = parent.layer.getFrameIndex(window.name);
+                parent.layer.close(index);
+            });
+            //#endregion
+
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+
+            //#endregion
+
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                //鍒濆鍖栨棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                
+                get_FastQuery();
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , page: false
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠ｇ爜', title: '浜у搧鍣ㄥ叿浠ｇ爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200 }
+                        , { field: 'HEquipID', title: 'HEquipID', width: 200, hide: true }
+                        , { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
+                        , { field: '璁惧', title: '璁惧', width: 200 }
+                        , { field: '缁翠慨椤圭洰浠ｇ爜', title: '缁翠慨椤圭洰浠ｇ爜', width: 200 }
+                        , { field: '缁翠慨椤圭洰', title: '缁翠慨椤圭洰', width: 160 }
+                        , { field: '缁翠慨寮�濮嬫棩鏈�', title: '缁翠慨寮�濮嬫棩鏈�', width: 160, templet: "<div>{{d.缁翠慨寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.缁翠慨寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁翠慨缁撴潫鏃ユ湡', title: '缁翠慨缁撴潫鏃ユ湡', width: 160, templet: "<div>{{d.缁翠慨缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁翠慨缁撴潫鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁翠慨鍐呭', title: '缁翠慨鍐呭', width: 200 }
+                        , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅', width: 200 }
+                        , { field: '璁″垝缁翠慨宸ユ椂', title: '璁″垝缁翠慨宸ユ椂', width: 200, totalRow: true }
+                        , { field: '瀹為檯缁翠慨宸ユ椂', title: '瀹為檯缁翠慨宸ユ椂', width: 200, totalRow: true }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: '缁翠慨浜轰唬鐮�', title: '缁翠慨浜轰唬鐮�', width: 200 }
+                        , { field: '缁翠慨浜�', title: '缁翠慨浜�', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 115 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '缁翠慨閮ㄩ棬浠ｇ爜', title: '缁翠慨閮ㄩ棬浠ｇ爜', width: 115 }
+                        , { field: '缁翠慨閮ㄩ棬', title: '缁翠慨閮ㄩ棬', width: 200 }
+                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
+                        , { field: '缁翠慨绫诲瀷', title: '缁翠慨绫诲瀷', width: 115 }
+                        , { field: '缁翠慨鍚庢柊瑙勬牸', title: '缁翠慨鍚庢柊瑙勬牸', width: 200 }
+                        , { field: '鏂拌璁″鍛�', title: '鏂拌璁″鍛�', width: 200 }
+                        , { field: '缁翠慨瑕佹眰', title: '缁翠慨瑕佹眰', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, totalRow: true }
+                        //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+                        //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+                        , { field: 'HRepairID', title: 'HRepairID', width: 115, hide: true }
+                        , { field: '瀛愮淮淇」鐩唬鐮�', title: '瀛愮淮淇」鐩唬鐮�', width: 200 }
+                        , { field: '瀛愮淮淇」鐩�', title: '瀛愮淮淇」鐩�', width: 200 }
+                        , { field: '瀛愮淮淇姹�', title: '瀛愮淮淇姹�', width: 200 }
+                        , { field: '瀛愯礋璐ｄ汉浠ｇ爜', title: '瀛愯礋璐ｄ汉浠ｇ爜', width: 200 }
+                        , { field: '瀛愯礋璐ｄ汉', title: '瀛愯礋璐ｄ汉', width: 200 }
+                        , { field: '缁翠慨璐圭敤', title: '缁翠慨璐圭敤', width: 115 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        //, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        //, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
+                    ]]
+                };
+
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 5000, 50000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            page = obj.curr;
+                            size = obj.limit;
+                            get_FastQuery();
+                        }
+                    }
+                }
+                laypage.render(optionPage);
+            }
+
+            //鍒嗛〉鏌ヨ
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();
+                sWhere += addSWhereByOpenType();//娣诲姞鍗曟嵁妯″潡閫夋嫨鍩虹璧勬枡鏃剁殑杩囨护鏉′欢锛屽凡瀹℃牳鏈叧闂�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_QCVerificationBillMain/GetListPage',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
+                    success: function (data1) {
+                        option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        optionPage.count = data1.count;
+                        if (data1.code == 1) {
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            var data = [];
+                            var col = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                            for (var i = 0; i < data.length; i++) {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: 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 });
+                                            break;
+                                        case 'Int32':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+                                            break;
+                                        default:
+                                            if (data[i].name === '鍗曟嵁鍙�') {
+                                                col.push({
+                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+                                                    templet: function (d) {
+                                                        return '<span style="color: blue;" lay-unrow >' + d.鍗曟嵁鍙� + '</span>'
+                                                    }, style: 'cursor: pointer;', event: 'onHBillNumberClickHandler'
+                                                });
+                                            } else {
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
+                                            }
+                                    }
+                                }
+                            }
+
+                            columns = col;
+                            option.cols = [col];
+                            option.data = data1.data;
+                            option.totalRow = true;
+                            laypage.render(optionPage);
+
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+                            ////鍒锋柊琛ㄦ牸鏁版嵁
+                            ins = table.render(option);
+
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+
+                            layer.close(ajaxLoad);
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                get_DefaultModule()
+                            }
+
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板' + HPageTitle,
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Add_Edit_Gy_QCVerificationBill.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Add_Edit_Gy_QCVerificationBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Gy_QCVerificationBillMain/DeltetGy_QCVerificationBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_QCVerificationBillMain/AuditQCVerificationBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Gy_QCVerificationBillMain/AuditQCVerificationBillMain", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+            }
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MouldMaintainBill/CloseGy_QCVerificationBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+                var ColName = $("#ColName").val();//澶嶉�夋
+                var Comparator = $("#Comparator").val()
+                var ColContent = $("#ColContent").val();
+
+                var ColName1 = $("#ColName1").val();//澶嶉�夋
+                var Comparator1 = $("#Comparator1").val()
+                var ColContent1 = $("#ColContent1").val();
+                var ColName2 = $("#ColName2").val();//澶嶉�夋
+                var Comparator2 = $("#Comparator2").val()
+                var ColContent2 = $("#ColContent2").val();
+
+                if (ColName != 0 && Comparator != 0) {
+                    var com = "";
+                    switch (Comparator) {
+                        case "7":
+                            com = "like'%" + ColContent + "%'";
+                            break;
+                        case "8":
+                            com = "like'%" + ColContent + "'";
+                            break;
+                        case "9":
+                            com = "like'" + ColContent + "%'";
+                            break;
+                        case "10":
+                            com = "not like'%" + ColContent + "%'";
+                            break;
+                        default:
+                            com = "" + Comparator + "'" + ColContent + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName + " " + com;
+                }
+                if (ColName1 != 0 && Comparator1 != 0) {
+                    var com1 = "";
+                    switch (Comparator1) {
+                        case "7":
+                            com1 = "like'%" + ColContent1 + "%'";
+                            break;
+                        case "8":
+                            com1 = "like'%" + ColContent1 + "'";
+                            break;
+                        case "9":
+                            com1 = "like'" + ColContent1 + "%'";
+                            break;
+                        case "10":
+                            com1 = "not like'%" + ColContent1 + "%'";
+                            break;
+                        default:
+                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName1 + " " + com1;
+                }
+                if (ColName2 != 0 && Comparator2 != 0) {
+                    var com2 = "";
+                    switch (Comparator2) {
+                        case "7":
+                            com2 = "like'%" + ColContent2 + "%'";
+                            break;
+                        case "8":
+                            com2 = "like'%" + ColContent2 + "'";
+                            break;
+                        case "9":
+                            com2 = "like'" + ColContent2 + "%'";
+                            break;
+                        case "10":
+                            com2 = "not like'%" + ColContent2 + "%'";
+                            break;
+                        default:
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+                            break;
+                    }
+                    sWhere += " and " + ColName2 + " " + com2;
+                }              
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }                
+                get_DisplayPage(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;              
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");              
+                $("#btnSearch").click();
+                $("#ColContent").val("");
+                $("#ColName").val("0");
+                $("#Comparator").val("0");
+                $("#ColContent2").val("");
+                $("#ColName2").val("0");
+                $("#Comparator2").val("0");
+                $("#ColContent1").val("");
+                $("#ColName1").val("0");
+                $("#Comparator1").val("0");
+                form.render('select');
+                sWhere = "";
+            }
+
+            //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+            function ColFilter() {
+                var Organization = '<option  value="0" selected="selected" ></option>';
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    if (option.cols[0][i].hide != true) {
+                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+                    }
+                }
+                $("#ColName").empty();
+                $("#ColName").append(Organization);
+                $("#ColName1").empty();
+                $("#ColName1").append(Organization);
+                $("#ColName2").empty();
+                $("#ColName2").append(Organization);
+                form.render('select');
+            }
+            //#endregion
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+            function addSWhereByOpenType() {
+                //鑾峰彇鍙傛暟
+                var params = getUrlVars();
+                var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var addSWhere = "";
+                if (typeof (openType) != "undefined") {
+                    addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+                }
+                return addSWhere;
+            }
+            //#endregion
+
+            //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
+
+                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+                for (var i = 0; i < valueList.length; i++) {
+                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+                }
+
+                $("#HInitTimeCycle").empty();
+                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+                form.render('select');
+
+                $("#HInitTimeCycle").val("29");
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            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);
+                                }
+                            }
+
+                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                            if (HInitTimeCycle != -1) {
+                                $('#HBeginDate').prop('disabled', true);
+                                $('#HEndDate').prop('disabled', true);
+
+                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+                                //鎵ц鏌ヨ鏂规硶
+                                get_FastQuery();
+                            } else {
+                                $('#HBeginDate').prop('disabled', false);
+                                $('#HEndDate').prop('disabled', false);
+                            }
+
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery(2)
+                            form.render("select");
+                        } else {
+                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+                            document.getElementById("HFilterScheme_Now").style.display = "none";
+                           
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#region鑷畾涔変簨浠惰皟鐢�
+            function onHBillNumberClickHandler(data) {
+                var hID = data.hmainid
+                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缂栬緫' + HPageTitle
+                    , closeBtn: 1
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: '../妯℃不鍏风鐞�/Add_Edit_Gy_QCVerificationBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                    , resize: false,
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+
+            }
+            //#endregion
+
+            //淇濆瓨鏂规
+            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");
+                        }
+                    }
+                })
+            }
+
+            //#region 瀵煎嚭Execel
+            function get_Export() {
+                var ModRightNameCheck = "Sb_MouldRepairWorkBillList_ExportExcel";
+
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            table.exportFile(ins.config.id, option.data, "xls");
+                        } else {
+                            layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].HInterID
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\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/KF_BarCodeStatusChangeBill.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/KF_BarCodeStatusChangeBill.html"
index 9684df7..06e3e0a 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/KF_BarCodeStatusChangeBill.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/KF_BarCodeStatusChangeBill.html"
@@ -45,6 +45,38 @@
         .layui-form-label {
             width: 25%;
         }
+        /* 娣诲姞绮樿创鍖哄煙鏍峰紡 */
+        .paste-area {
+            border: 2px dashed #ccc;
+            border-radius: 5px;
+            padding: 20px;
+            text-align: center;
+            margin: 10px;
+            background-color: #f9f9f9;
+            cursor: pointer;
+            min-height: 80px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+        }
+
+            .paste-area:hover {
+                border-color: #1E9FFF;
+                background-color: #f0f9ff;
+            }
+
+            .paste-area i {
+                font-size: 30px;
+                color: #1E9FFF;
+                margin-bottom: 10px;
+            }
+
+            .paste-area .paste-hint {
+                color: #666;
+                font-size: 14px;
+                margin-top: 5px;
+            }
     </style>
 
 </head>
@@ -75,30 +107,30 @@
                                             </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="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
-                                                    <option style="color:blue;" value="1">鏈</option>
-                                                    <option style="color:blue;" value="2">瀹℃牳閫氳繃</option>
-                                                    <option style="color:blue;" value="3">鍏抽棴</option>
-                                                    <option style="color:blue;" value="4">浣滃簾</option>
-                                                    <option style="color:blue;" value="5">瀹℃牳閫�鍥�</option>
-                                                    <option style="color:blue;" value="6">瀹℃牳涓�</option>
-                                                    <option style="color:blue;" value="7">宸查槄</option>
-                                                    <option style="color:blue;" value="8">宸插洖澶�</option>
-                                                    <option style="color:blue;" value="9">缁撴</option>
-                                                    <option style="color:blue;" value="10">楠岃瘉</option>
-                                                    <option style="color:blue;" value="11">涓嬭揪</option>
-                                                    <option style="color:blue;" value="12">寮�宸�</option>
-                                                    <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
-                                                    <!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
-                                                    <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
-                                                    <option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
-                                                    <option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
+                            <label class="layui-form-label" style="width: 85px;">鍗曟嵁鐘舵��</label>
+                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                <select name="HBillStatus" id="HBillStatus" lay-verify="HBillStatus">
+                                    <option style="color:blue;" value="1">鏈</option>
+                                    <option style="color:blue;" value="2">瀹℃牳閫氳繃</option>
+                                    <option style="color:blue;" value="3">鍏抽棴</option>
+                                    <option style="color:blue;" value="4">浣滃簾</option>
+                                    <option style="color:blue;" value="5">瀹℃牳閫�鍥�</option>
+                                    <option style="color:blue;" value="6">瀹℃牳涓�</option>
+                                    <option style="color:blue;" value="7">宸查槄</option>
+                                    <option style="color:blue;" value="8">宸插洖澶�</option>
+                                    <option style="color:blue;" value="9">缁撴</option>
+                                    <option style="color:blue;" value="10">楠岃瘉</option>
+                                    <option style="color:blue;" value="11">涓嬭揪</option>
+                                    <option style="color:blue;" value="12">寮�宸�</option>
+                                    <option style="color:blue;" value="13">鐢宠瀹℃壒</option>-->
+                                        <!--<option style="color:blue;" value="14">鐢宠妫�楠�</option>-->
+                                        <!--<option style="color:blue;" value="15">鐢宠妫�楠�</option>
+                                    <option style="color:blue;" value="16">鍒ゅ畾鍚堟牸</option>
+                                    <option style="color:blue;" value="17">鍒ゅ畾涓嶅悎鏍�</option>
 
-                                                </select>
-                                            </div>
-                                        </div>-->
+                                </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;">
@@ -229,7 +261,15 @@
                         <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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm layui-btn-warm" lay-event="btn-PasteExcel"><i class="layui-icon layui-icon-file-excel"></i>Excel绮樿创</button>
+                        </div>
+                        <!-- 绮樿创鍖哄煙-->
+                        <div id="excelPasteArea" class="paste-area" style="display: none; margin-top: 10px;">
+                            <i class="layui-icon layui-icon-file-excel"></i>
+                            <div>璇蜂粠Excel澶嶅埗鏁版嵁鍚庯紝鐐瑰嚮姝ゅ鎴栨寜Ctrl+V绮樿创</div>
+                            <div class="paste-hint">鏀寔澶嶅埗澶氳鏁版嵁锛岀郴缁熶細鑷姩鍖归厤鍒楁爣棰�</div>
+                            <div class="paste-hint" style="color: #ff5722; margin-top: 10px;">褰撳墠鏀寔绮樿创鐨勫垪锛氭潯褰㈢爜銆佺姸鎬併�佽〃浣撳娉�</div>
+                            <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" style="margin-top: 10px;" id="btnCancelPaste">鍙栨秷绮樿创</button>
                         </div>
                     </script>
                 </form>
@@ -302,7 +342,15 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-
+            var isPasteMode = false;
+            var columnMapping = {
+                '鏉″舰鐮�': 'HBarCode',
+                '鐘舵��': 'HBarCodeStatus_New',
+                '琛ㄤ綋澶囨敞': 'HRemark',
+                '鍏宠仈鏁伴噺': 'HRelationQty',
+                '鍏宠仈閲戦': 'HRelationMoney',
+                '鍘熺姸鎬�': 'HBarCodeStatus_Old'
+            };//鏍囬鍖归厤----澶嶅埗鍚庢牴鎹噷闈㈢殑鍐呭鍖归厤
             var rowdata = [{
                 "HRelationQty": 0, "HRelationMoney": 0, "HRemark": "", "HBarCode": "", "HBarCodeStatus_Old": ""
                 , "HBarCodeStatus_New": ""
@@ -388,6 +436,15 @@
                             checkRefresh();
                         }
                         break;
+                    case 'btn-PasteExcel':
+                        isPasteMode = !isPasteMode;
+                        if (isPasteMode) {
+                            $('#excelPasteArea').show();
+                            layer.msg('璇蜂粠Excel澶嶅埗鏁版嵁鍚庯紝鐐瑰嚮绮樿创鍖哄煙鎴栨寜Ctrl+V绮樿创', { icon: 1 });
+                        } else {
+                            $('#excelPasteArea').hide();
+                        }
+                        break;
                     ////鍒楄缃�
                     //case 'set_HideColumn':
                     //    get_HideColumn();
@@ -441,6 +498,151 @@
 
             //#endregion
 
+            //#region 绮樿创浠ｇ爜鍧�
+            $(document).ready(function () {
+                $('#excelPasteArea').on('click', function (e) {
+                    if (isPasteMode) {
+                        $(this).focus();
+                    }
+                });
+                $('#btnCancelPaste').on('click', function () {
+                    isPasteMode = false;
+                    $('#excelPasteArea').hide();
+                });
+
+                // 鐩戝惉鍏ㄥ眬绮樿创浜嬩欢--->绮樿创鐩戝惉layui娌℃湁锛寊hege鐢ㄥ師鐢熺洃鍚�
+                $(document).on('paste', function (e) {
+                    if (!isPasteMode) return;
+                    e.preventDefault();
+
+                    // 鑾峰彇鍓创鏉挎暟鎹紙window.clipboardData杩欎釜涓嶇煡閬撲负浠�涔堥�氳繃window鎷夸笉鍒扮矘璐存澘鐨勫唴瀹癸紝鎸夐亾鐞嗚搴旇鍙互閫氳繃window鏉ョ洿鎺ヨ幏鍙栧埌锛�
+                    var clipboardData = e.originalEvent.clipboardData || window.clipboardData;
+                    var pastedData = clipboardData.getData('text');
+                    if (pastedData) {
+                        processExcelData(pastedData);
+                    }
+                });
+
+                // 鐩戝惉鑷繁
+                $('#excelPasteArea').on('paste', function (e) {
+                    if (!isPasteMode) return;
+                    e.preventDefault();
+                    e.stopPropagation();
+
+                    var clipboardData = e.originalEvent.clipboardData || window.clipboardData;
+                    var pastedData = clipboardData.getData('text');
+
+                    if (pastedData) {
+                        processExcelData(pastedData);
+                    }
+                });
+            });
+
+            // 澶勭悊Excel绮樿创鏁版嵁
+            function processExcelData(pastedData) {
+                try {
+                    // 锛圗xcel澶嶅埗鐨勬暟鎹�氬父鏄埗琛ㄧ鍒嗛殧锛屽垎鍓插嚭鏉ヨ繘琛屾搷浣滐紝涔熷彲浠ヨ瘯璇曠粰鍚庣鍓诧紝杩涜鍏朵粬鎿嶄綔锛屽啀浼犲洖鏉ワ級
+                    var rows = pastedData.split(/\r\n|\n|\r/);
+                    if (rows.length === 0) {
+                        layer.msg('娌℃湁妫�娴嬪埌鏁版嵁', { icon: 2 });
+                        return;
+                    }
+                    // 瑙ｆ瀽绗竴琛屼綔涓烘爣棰樿锛岀劧鍚庡拰涓婇潰杩涜mapping
+                    var headers = rows[0].split('\t');
+                    var columnIndices = {};
+                    for (var i = 0; i < headers.length; i++) {
+                        var header = headers[i].trim();
+                        if (columnMapping[header]) {
+                            columnIndices[columnMapping[header]] = i;
+                        }
+                    }
+
+                    if (Object.keys(columnIndices).length === 0) {
+                        layer.msg('鏈瘑鍒埌鍖归厤鐨勫垪鏍囬锛岃妫�鏌xcel鍒楀悕', { icon: 2 });
+                        return;
+                    }
+
+                    var newRows = [];
+                    var dataRows = rows.slice(1);
+
+                    for (var r = 0; r < dataRows.length; r++) {
+                        var rowData = dataRows[r].split('\t');
+                        if (rowData.length === 0 || (rowData.length === 1 && rowData[0].trim() === '')) {
+                            continue;
+                        }
+                        // 鍒涘缓鏂拌瀵硅薄锛堢浉褰撲簬鏂板涓�琛岀殑鎿嶄綔
+                        var newRow = {
+                            "HRelationQty": 0,
+                            "HRelationMoney": 0,
+                            "HRemark": "",
+                            "HBarCode": "",
+                            "HBarCodeStatus_Old": "",
+                            "HBarCodeStatus_New": ""
+                        };
+                        for (var field in columnIndices) {
+                            var colIndex = columnIndices[field];
+                            if (colIndex < rowData.length) {
+                                var value = rowData[colIndex].trim();
+                                //涓嬫媺妗嗙殑鍒ゆ柇锛屽彲浠ヤ笉瑕�
+                                if (field === 'HBarCodeStatus_New') {
+                                    var validStatus = ['鍑哄簱', '鍏ュ簱', '寮傚父', '绌�'];
+                                    if (validStatus.indexOf(value) === -1) {
+                                        value = '';
+                                    }
+                                }
+
+                                newRow[field] = value;
+                            }
+                        }
+
+                        // 妫�鏌ユ潯褰㈢爜鏄惁涓虹┖锛岃嫢涓嶈鏉″舰鐮佸垽鏂紝鍒犱簡灏辫
+                        if (newRow.HBarCode && newRow.HBarCode.trim() !== '') {
+                            newRows.push(newRow);
+                        }
+                    }
+
+                    if (newRows.length === 0) {
+                        layer.msg('鏉″舰鐮佷笉鑳戒负绌�', { icon: 2 });
+                        return;
+                    }
+
+                    // 璺充釜寮规
+                    layer.confirm('灏嗘坊鍔� ' + newRows.length + ' 琛屾暟鎹紝鏄惁缁х画锛�', {
+                        icon: 3,
+                        title: '纭绮樿创',
+                        btn: ['纭畾', '鍙栨秷']
+                    }, function (index) {
+                        var currentData = table.cache["mainTable"];
+                        var isEmptyRow = function (row) {
+                            return (!row.HBarCode || row.HBarCode.trim() === '') &&
+                                (!row.HBarCodeStatus_New || row.HBarCodeStatus_New.trim() === '') &&
+                                (!row.HRemark || row.HRemark.trim() === '');
+                        };
+                        if (currentData.length === 1 && isEmptyRow(currentData[0])) {
+                            table.cache["mainTable"] = [];
+                        }
+                        for (var i = 0; i < newRows.length; i++) {
+                            table.cache["mainTable"].push(newRows[i]);
+                        }
+
+                        option.data = table.cache["mainTable"];
+                        table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+                            $('#HBarCodeStatus_New' + i).find("option[value='" + (option.data[i - 1].HBarCodeStatus_New || '') + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        checkRefresh();
+                        isPasteMode = false;
+                        $('#excelPasteArea').hide();
+                        layer.msg('鎴愬姛娣诲姞 ' + newRows.length + ' 琛屾暟鎹�', { icon: 1 });
+                        layer.close(index);
+                    });
+
+                } catch (error) {
+                    layer.msg('绮樿创澶辫触锛�' + error.message, { icon: 2 });
+                }
+            }
+            //#endregion
             //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
             // 鍒濆鍖栫晫闈�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
index e83f1b4..2887155 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\210\266\351\200\240\345\221\250\346\234\237\346\212\245\350\241\250/Sc_ProductionCycleBillList.html"
@@ -408,9 +408,11 @@
                     $('#HBeginDate').prop('disabled', false);
                     $('#HEndDate').prop('disabled', false);
                 }
-
+                var today = new Date();
+                var twoDaysAgo = new Date();
+                twoDaysAgo.setDate(today.getDate() - 2);
                 //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
 
                 //鍒濆鍖栫粍缁�
@@ -642,6 +644,10 @@
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
                                 data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                var patrn = new RegExp(/^h/i);
+                                if (patrn.test(data1.list[key].ColmCols)) {
+                                    titleData[key] = data1.list[key].ColmCols;
+                                }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
                             col.push({ type: 'checkbox', fixed: 'left' });
@@ -1247,7 +1253,7 @@
                 $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                 form.render('select');
 
-                $("#HInitTimeCycle").val("3");
+                $("#HInitTimeCycle").val("-1");
             }
             //#endregion
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
index a6da258..8b4b821 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBillList.html"
@@ -328,7 +328,8 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鏌ヨ
-            get_Display(sWhere);
+            get_FastQuery();
+            //get_Display(sWhere);
 
 
             ColFilter();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
index 5d48e5c..f82a9a9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/JIT_NeedMaterPlanConfigBillList.html"
@@ -11,6 +11,7 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/soulTable.slim.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 </head>
 <body>
     <div class="layui-fluid">
@@ -23,6 +24,25 @@
                                 <div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
                                         <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -259,7 +279,28 @@
                 }
             });
         })
-            //#endregion
+        //#endregion
+
+        //#region
+        //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+        form.on('select(HInitTimeCycle)', function (data) {
+            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+            if (HInitTimeCycle != -1) {
+                $('#HBeginDate').prop('disabled', true);
+                $('#HEndDate').prop('disabled', true);
+
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                //鎵ц鏌ヨ鏂规硶
+                get_FastQuery();
+            } else {
+                $('#HBeginDate').prop('disabled', false);
+                $('#HEndDate').prop('disabled', false);
+            }
+        });
+        //#endregion
 
         //#region 杞﹂棿
         form.on('submit(btnHHWorkShopID)', function (data) {
@@ -291,6 +332,22 @@
 
         //#region 鍒濆鍖栫晫闈�
         function set_ClearBill() {
+            //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+            setSelect_HInitTimeCycle();
+            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+            if (HInitTimeCycle != -1) {
+                $('#HBeginDate').prop('disabled', true);
+                $('#HEndDate').prop('disabled', true);
+            } else {
+                $('#HBeginDate').prop('disabled', false);
+                $('#HEndDate').prop('disabled', false);
+            }
+
+            //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             //鏌ヨ
@@ -437,7 +494,23 @@
             });
         }
 
+        //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+        function setSelect_HInitTimeCycle() {
+            var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+            var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�"];
 
+            var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+            for (var i = 0; i < valueList.length; i++) {
+                HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+            }
+
+            $("#HInitTimeCycle").empty();
+            $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+            form.render('select');
+
+            $("#HInitTimeCycle").val("29");
+        }
+        //#endregion
 
         //闅愯棌鍒楄缃�
         function get_HideColumn() {
@@ -567,6 +640,8 @@
 
         //#region 蹇�熻繃婊�
         function get_FastQuery() {
+            var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
             var HBillNo = $("#HBillNo").val();
             var HWorkShopIDName = $("#HWorkShopIDName").val();//杞﹂棿
             var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -646,6 +721,12 @@
                 }
                 sWhere += " and " + ColName2 + " " + com2;
             }
+            if (HDate) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+            }
             if (HBillNo) {
                 sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%' ";
             }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
index aff4e9c..b7138e8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
@@ -582,6 +582,12 @@
                     if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                         item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
                     }
+                    if (itemobj === '瑙勬牸鍨嬪彿') {
+                        item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                    }
+                    if (itemobj === '鐗╂枡鍚嶇О') {
+                        item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                    }
                 }
             });
 
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 696f919..020bd93 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"
@@ -3170,6 +3170,9 @@
                 if (openType == 3) {
                     addSWhere += " and 鍗曟嵁鐘舵�� = '宸插鏍�'";
                 }
+                if (openType == 4) {   //鎺掍骇椤甸潰杩囨护鐢熶骇璁㈠崟
+                    addSWhere += " and HDeptID = " + HSecondID + " and 鐘舵�� != '缁撶畻' and 鐘舵�� != '缁撴' and 鐘舵�� != '瀹屽伐'";
+                }
                 return addSWhere;
             }
             //#endregion
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/JIT_DayPlanPlatForm.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/JIT_DayPlanPlatForm.html"
index d861a52..5fea980 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/JIT_DayPlanPlatForm.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/JIT_DayPlanPlatForm.html"
@@ -821,9 +821,10 @@
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
             get_FastQuery(1);
+            get_FastQuery_ICMO();//鏌ヨ甯︽帓浜ц鍗�
             //闅愯棌鍕鹃�夊瓧娈�
             DisPlay_HideColumn();
-            get_Display2(sWhere_ICMO);
+            
         }
         //#endregion
 
@@ -1073,7 +1074,7 @@
             option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
-                , height: 'full-120'
+                , height: 600
                 , page: false
                 , cellMinWidth: 90
                 , cols: [columns]
@@ -1082,14 +1083,16 @@
                     soulTable.render(this);
                     $('.layui-table thead').on('click', 'th', function () {
                         // 鑾峰彇鐐瑰嚮鐨勮〃澶寸殑 field 鍊�
-                        var field = $(this).data('field');
-                        set_InitGrid1(field);
-                        sWhere = {
-                            HORGID: sessionStorage["OrganizationID"]
-                            , HBEGINDATE: field
-                            , HENDDATE: field
-                        }
-                        get_Display_3(JSON.stringify(sWhere));
+                        var field = $(this).data('field');                       
+                        if (isDateField(field)) {
+                            set_InitGrid1(field);
+                            sWhere = {
+                                HORGID: sessionStorage["OrganizationID"],
+                                HBEGINDATE: field,
+                                HENDDATE: field
+                            };
+                            get_Display_3(JSON.stringify(sWhere));
+                        }                
                     });
                     //res.data.forEach(function (item, index) {
                     //    if (data1.data.DataColor != undefined) {
@@ -1573,7 +1576,10 @@
             }
             if (HICMOBillNo_ICMO) {
                 sWhere_ICMO += " and 鍗曟嵁鍙� like '%" + HICMOBillNo_ICMO + "%'";
-            }
+            }           
+            sWhere_ICMO += " and 鐢熶骇缁勭粐 = '" + sessionStorage["Organization"] +"'";
+
+            sWhere_ICMO += "    Order By 鏃ユ湡  desc";
 
             get_Display2(sWhere_ICMO);
             sWhere_ICMO = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -1741,7 +1747,7 @@
                 , area: ['90%', '90%']//澶у皬
                 , title: '鐢熶骇璁㈠崟鍒楄〃'//鏍囬
                 , shift: 2//寮瑰嚭鍔ㄧ敾
-                , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?HDeptID=' + HDeptID, 'yes']
+                , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType =4&HDeptID=' + HDeptID, 'yes']
                 , btn: ['纭畾', '鍙栨秷']
                 , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                     var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -1902,6 +1908,7 @@
                     }
                 });
             } else {
+                layer.close(ajaxLoad); // 鍏抽棴鎸囧畾loading
                 return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹繘琛屽伐鑹鸿矾绾跨紪杈�");
             }
         }
@@ -3274,6 +3281,7 @@
             var ajaxLoad = layer.load();
             if (checkStatus.data.length != 1) {
                 layer.alert("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                layer.close(ajaxLoad);
             } else {
                 var TabData = checkStatus.data;
                 var HMaterID = TabData[0].HMaterID;
@@ -3784,6 +3792,45 @@
             })
         }
 
+        // 鍒ゆ柇琛ㄥご鏍囬鏄惁涓烘棩鏈熸牸寮�
+        function isDateField(field) {
+            // 妫�鏌ユ棩鏈熸牸寮�
+            var datePatterns = [
+                /^\d{4}-\d{2}-\d{2}$/,           // YYYY-MM-DD
+                /^\d{4}\/\d{2}\/\d{2}$/,         // YYYY/MM/DD
+                /^\d{2}-\d{2}-\d{4}$/,           // DD-MM-YYYY
+                /^\d{2}\/\d{2}\/\d{4}$/,         // DD/MM/YYYY
+                /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/, // YYYY-MM-DD HH:mm:ss
+                /^\d{4}骞碶d{2}鏈圽d{2}鏃�$/        // 涓枃鏃ユ湡
+            ];
+
+            return datePatterns.some(pattern => pattern.test(field));
+        }
+        //椤甸潰鎺掑簭
+        table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+            table.reload('mainTable', {
+                initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                    field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
+                    , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
+                }
+            });
+            option.data = layui.table.cache["mainTable"];
+            table.render(option);
+        });
+
+        table.on('sort(mainTable_ICMO)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+            table.reload('mainTable_ICMO', {
+                initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                    field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
+                    , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈�  field order
+                }
+            });
+            option2.data = layui.table.cache["mainTable_ICMO"];
+            table.render(option);
+        });
+
         //鍒楁槑鏄剧ず涓嬫媺妗�
         function ColFilter() {
             var Organization = '<option  value="0" selected="selected" ></option>';
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index e2f48e0..19ea591 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -582,6 +582,13 @@
                     }
                     if (item[itemobj].length > 0) {  // 鍋囪瀛楁鍚嶄负field
                         item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                        item[itemobj] = item[itemobj].toString().replace(/,/g, '');  // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+                    }
+                    if (itemobj === '瑙勬牸鍨嬪彿') {
+                        item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+                    }
+                    if (itemobj === '鐗╂枡鍚嶇О') {
+                        item[itemobj] = item[itemobj].replace(/,/g, '锛�');  // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
                     }
                 }
             });
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index f73d19b..c852b26 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -768,6 +768,8 @@
                         layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
                     }
                     , btn2: function (index, layero) {
+                        $("#HDept").val("");
+                        $("#HDeptID").val(0);
                         //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
                         //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                     },
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 ebbbdd1..ad4dfe7 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"
@@ -2764,8 +2764,56 @@
                         //setTableByHMater(obj, data);
                     }
                 })
+                //宸ヤ綔涓績涓嬫媺鎼滅储妗�
+                tableSelect.render({
+                    elem: 'td[data-field="宸ヤ綔涓績浠ｇ爜"] .layui-table-edit',
+                    searchKey: '宸ヤ綔涓績浠ｇ爜,宸ヤ綔涓績鍚嶇О',
+                    sWhere: " ",//table鎼滅储sWhere鏉′欢
+                    ajaxSelect: function (sWhere) {
+                        var data = '';
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_WorkCenter/list',
+                            type: "GET",
+                            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                            async: false,
+                            success: function (data1) {
+                                if (data1.count == 1) {
+                                    data = data1.data
+                                }
+                            },
+                            error: function () {
+                                layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+                            }
+                        });
+                        return data;
+                    },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+                    table: {
+                        cols: [[
+                            { type: 'radio', fixed: 'left' },
+                            { field: 'HItemID', title: 'HItemID', hide: true },
+                            { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' },
+                            { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' },
+                        ]],
+                        page: true,
+                        limit: 5,
+                        //limits: [5]
+                    },
+                    done: function (elem, data) {
+                        $(".layui-table-edit").blur();//鍗曞厓鏍煎け鍘荤劍鐐�
+                        obj.update({
+                            "宸ヤ綔涓績": data.data[0]["宸ヤ綔涓績鍚嶇О"]
+                            , "HCenterID": data.data[0]["HItemID"]
+                            , "宸ヤ綔涓績浠ｇ爜": data.data[0]["宸ヤ綔涓績浠ｇ爜"]
+                        })
+                        
+                        table.render(option);
 
 
+
+                        //setTableByHMater(obj, data);
+                    }
+                })
+
             }
 
             //缂栬緫 椤甸潰璧嬪��
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 74e2617..34c7593 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"
@@ -2358,13 +2358,17 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鐢熶骇鍏ュ簱妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
@@ -2472,11 +2476,12 @@
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鐢熶骇鍏ュ簱妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
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 ddb2cbf..156939b 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"
@@ -3112,11 +3112,12 @@
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鍑哄巶妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
@@ -4047,12 +4048,16 @@
             //閫夌潃妫�楠岄」鐩悗,鑾峰彇琛ㄤ綋
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鍑哄巶妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index dd37b82..d7017e1 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -1172,11 +1172,11 @@
                         $("#HMainProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);
 
                         var HQCSchemeID_Patrol = checkStatus.data[0].HQCSchemeID_Patrol;
-
+                        var HMaterID = $("#HMaterID").val();
                         $.ajax({
                             url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                             type: "GET",
-                            data: { "CheckProjectID": HQCSchemeID_Patrol,"HBatchQty": 0 },
+                            data: { "CheckProjectID": HQCSchemeID_Patrol, "HBatchQty": 0, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },
                             success: function (result) {
                                 if (result.code == 1) {
                                     var rowdata = [];
@@ -1697,11 +1697,12 @@
             $("#HMainProcName").val(obj[0].宸ュ簭鍚嶇О);
 
             var HQCSchemeID_Patrol = obj[0].HQCSchemeID_Patrol;
+            var HMaterID = $("#HMaterID").val();
 
             $.ajax({
                 url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                 type: "GET",
-                data: { "CheckProjectID": HQCSchemeID_Patrol, "HBatchQty": 0 },
+                data: { "CheckProjectID": HQCSchemeID_Patrol, "HBatchQty": 0, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },               
                 success: function (result) {
                     if (result.code == 1) {
                         var rowdata = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
index 8506aba..8c5855b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill_XW.html"
@@ -193,7 +193,7 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            
+
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-row" style="display:none">
@@ -340,6 +340,15 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <!--琛屼笅鎷夐�夋嫨(鍒嗘瀽鏂规硶)-->
+    <script type="text/html" id="HAnalysisMethod">
+        <select name="HAnalysisMethod" lay-filter="HAnalysisMethod" id="HAnalysisMethod{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="1">瀹氭�у垎鏋�</option>
+            <option value="2">瀹氶噺鍒嗘瀽</option>
+            <option value="3">鍏朵粬鍒嗘瀽</option>
+        </select>
+    </script>
     <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�1)-->
     <script type="text/html" id="HQCNote1">
         <select name="HQCNote1" lay-filter="HQCNote1" id="HQCNote1{{d.LAY_TABLE_INDEX+1}}">
@@ -375,6 +384,14 @@
     <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�5)-->
     <script type="text/html" id="HQCNote5">
         <select name="HQCNote5" lay-filter="HQCNote5" id="HQCNote5{{d.LAY_TABLE_INDEX+1}}">
+            <option value="">璇烽�夋嫨</option>
+            <option value="鍚堟牸">鍚堟牸</option>
+            <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+        </select>
+    </script>
+    <!--琛屼笅鎷夐�夋嫨(妫�楠岃褰�6)-->
+    <script type="text/html" id="HQCNote6">
+        <select name="HQCNote6" lay-filter="HQCNote6" id="HQCNote6{{d.LAY_TABLE_INDEX+1}}">
             <option value="">璇烽�夋嫨</option>
             <option value="鍚堟牸">鍚堟牸</option>
             <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
@@ -453,7 +470,7 @@
                     { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
                     , { field: 'HQCNote1_SN', title: '鎶芥SN1', width: 185, edit: 'text', hide: true }
-                    , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true}
+                    , { field: 'HQCNote2_SN', title: '鎶芥SN2', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote3_SN', title: '鎶芥SN3', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote4_SN', title: '鎶芥SN4', width: 185, edit: 'text', hide: true }
                     , { field: 'HQCNote5_SN', title: '鎶芥SN5', width: 185, edit: 'text', hide: true }
@@ -465,31 +482,58 @@
                     , { field: '妫�楠岄」鐩垎绫�', title: '妫�楠岄」鐩垎绫�', event: "", width: 120 }
                     , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
                     , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text', width: 230 }
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 95, hide: true }
-                    , { field: 'HQCNote1', title: '妫�楠岃褰�1(09:00--11:00)', width: 185, templet: '#HQCNote1' }
-                   
-                    , { field: 'HQCNote2', title: '妫�楠岃褰�2(11:00--13:00)', width: 185, templet: '#HQCNote2' }
-                   
-                    , { field: 'HQCNote3', title: '妫�楠岃褰�3(13:00--15:00)', width: 185, templet: '#HQCNote3' }
-                    
-                    , { field: 'HQCNote4', title: '妫�楠岃褰�4(15:00--17:00)', width: 185, templet: '#HQCNote4' }
-                    
-                    , { field: 'HQCNote5', title: '妫�楠岃褰�5(17:00--19:00)', width: 185, templet: '#HQCNote5' }
-                   
-                    , { field: 'HQCNote6', title: '妫�楠岃褰�6(18:00--20:00)', edit: 'text', width: 185, hide: true }
-                   
+                    /////////////
+                    , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', width: 185, templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+                    , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
+                    , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', width: 185,edit: 'text', event: 'HInspectMethodName'}
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text', event: "", width: 125 }
+                  /*  , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text', width: 125 }*/
+                    , { field: 'HUpLimit', title: '涓婇檺鍊�', edit: 'text', width: 125}
+                    , { field: 'HDownLimit', title: '涓嬮檺鍊�', edit: 'text', width: 125 }
+
+                    , { field: 'HQCNote1', title: '08:00--10:00', width: 125, templet: '#HQCNote1' }
+                    , { field: 'HTargetVal', title: '妫�楠屽��1', edit: 'text', width: 185, }
+                    , { field: 'HQCNote2', title: '10:00--12:00', width: 125, templet: '#HQCNote2' }
+                    , { field: 'HTargetVal2', title: '妫�楠屽��2', edit: 'text', width: 185, }
+                    , { field: 'HQCNote3', title: '12:00--14:00', width: 125, templet: '#HQCNote3' }
+                    , { field: 'HTargetVal3', title: '妫�楠屽��3', edit: 'text', width: 185, }
+                    , { field: 'HQCNote4', title: '14:00--16:00', width: 125, templet: '#HQCNote4' }
+                    , { field: 'HTargetVal4', title: '妫�楠屽��4', edit: 'text', width: 185, }
+                    , { field: 'HQCNote5', title: '16:00--18:00', width: 125, templet: '#HQCNote5' }
+                    , { field: 'HTargetVal5', title: '妫�楠屽��5', edit: 'text', width: 185, }
+                    , { field: 'HQCNote6', title: '18:00--19:30', width: 125, templet: '#HQCNote6' }
+                    , { field: 'HTargetVal6', title: '妫�楠屽��6', edit: 'text', width: 185, }
                     , { field: 'HQCNote7', title: '妫�楠岃褰�7', edit: 'text', hide: true }
-                  
+
                     , { field: 'HQCNote8', title: '妫�楠岃褰�8', edit: 'text', hide: true }
-                   
+
                     , { field: 'HQCNote9', title: '妫�楠岃褰�9', edit: 'text', hide: true }
-                   
+
                     , { field: 'HQCNote10', title: '妫�楠岃褰�10', edit: 'text', hide: true }
-                  
+
                     , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 120 }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 75 }
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                //, done: function (res, curr, count) {
+                //    option.data = res.data;
+                //    //鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
+                //    $('.layui-form-select').find('input').unbind("blur");
+                //    //琛ㄦ牸閲嶈浇鍥炴樉涓嬫媺妗嗛噷鐨勬暟鎹�
+                //    $('tr').each(function (e) {
+                //        var $cr = $(this);
+                //        var dataIndex = $cr.attr("data-index");
+                //        $.each(option.data, function (index, value) {
+                //            if (value.LAY_TNDEX == dataIndex) {
+                //                $cr.find('input').val(value.HResult);
+                //                $cr.find('input').val(value.HAnalysisMethod);
+                //            }
+                //        });
+                //    });
+                //}
+                //, text: {
+                //    none: '鏃犳暟鎹紒'
+                //}
             };
 
             var option_BadRe = {
@@ -535,6 +579,7 @@
 
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{
+                    "HAnalysisMethod": 1, "HUpLimit": "", "HDownLimit": "", "HInspectMethodID": 0, "HInspectMethodName": "", "HTargetVal": "", "HTargetVal2": "", "HTargetVal3": "", "HTargetVal4": "", "HTargetVal5": "", "HTargetVal6": "",
                     "妫�楠岄」鐩垎绫�": "", "HQCCheckItemID": 0, "HQCCheckItemName": "", "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  "
                     , "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                     , "HQCNote1_SN": "", "HQCNote2_SN": "", "HQCNote3_SN": "", "HQCNote4_SN": "", "HQCNote5_SN": "", "HQCNote6_SN": "", "HQCNote7_SN": ""
@@ -579,16 +624,28 @@
                             var rowdata = [];
                             var data = result.data;
                             for (let i = 0; i < result.data.length; i++) {
+                                switch (data[i].鍒嗘瀽鏂规硶) {
+                                    case "瀹氭�у垎鏋�":
+                                        data[i].鍒嗘瀽鏂规硶 = "1";
+                                        break;
+                                    case "瀹氶噺鍒嗘瀽":
+                                        data[i].鍒嗘瀽鏂规硶 = "2";
+                                        break;
+                                    case "鍏朵粬鍒嗘瀽":
+                                        data[i].鍒嗘瀽鏂规硶 = "3";
+                                        break;
+                                }
                                 rowdata.push({
+                                    "HAnalysisMethod": data[i].鍒嗘瀽鏂规硶, "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].HInspectMethodName, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�, "HTargetVal": data[i].鐩爣鍊�, "HTargetVal2": data[i].鐩爣鍊�2, "HTargetVal3": data[i].鐩爣鍊�3, "HTargetVal4": data[i].鐩爣鍊�4, "HTargetVal5": data[i].鐩爣鍊�5, "HTargetVal6": data[i].鐩爣鍊�6,
                                     "妫�楠岄」鐩垎绫�": data[i].妫�楠岄」鐩垎绫�, "HQCCheckItemID": data[i].HQCCheckItemID, "HQCCheckItemName": data[i].妫�楠岄」鐩悕绉�,
                                     "HQCStd": data[i].HQCStd, "HQCNote1": data[i].HQCNote1, "HQCNote2": data[i].HQCNote2, "HQCNote3": data[i].HQCNote3,
                                     "HQCNote4": data[i].HQCNote4, "HQCNote5": data[i].HQCNote5, "HQCNote6": data[i].HQCNote6, "HQCNote7": data[i].HQCNote7,
                                     "HQCNote8": data[i].HQCNote8, "HQCNote9": data[i].HQCNote9, "HQCNote10": data[i].HQCNote10, "HRemark": data[i].琛ㄤ綋澶囨敞,
-                                   /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
+                                    /* "HQCNote1_SN": data[i].鎶芥SN鐮�1, "HQCNote2_SN": data[i].鎶芥SN鐮�2, "HQCNote3_SN": data[i].鎶芥SN鐮�3, "HQCNote4_SN": data[i].鎶芥SN鐮�4, "HQCNote5_SN": data[i].鎶芥SN鐮�5, "HQCNote6_SN": data[i].鎶芥SN鐮�6, "HQCNote7_SN": data[i].鎶芥SN鐮�7*/
                                     /*, "HQCNote8_SN": data[i].鎶芥SN鐮�8, "HQCNote9_SN": data[i].鎶芥SN鐮�9, "HQCNote10_SN": data[i].鎶芥SN鐮�10*/
                                 });
                             }
-                         
+
                             $("#HQCNote1_SN").val(data[0].鎶芥SN鐮�1 || '');
                             $("#HQCNote2_SN").val(data[0].鎶芥SN鐮�2 || '');
                             $("#HQCNote3_SN").val(data[0].鎶芥SN鐮�3 || '');
@@ -602,11 +659,25 @@
                             option.data = rowdata;
                             table.render(option);
                             for (var i = 0; i < result.data.length; i++) {
+                                switch (data[(i - 1)].鍒嗘瀽鏂规硶) {
+                                    case "瀹氭�у垎鏋�":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "1";
+                                        break;
+                                    case "瀹氶噺鍒嗘瀽":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "2";
+                                        break;
+                                    case "鍏朵粬鍒嗘瀽":
+                                        data[(i - 1)].鍒嗘瀽鏂规硶 = "3";
+                                        break;
+
+                                }
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + (data[(i - 1)].鍒嗘瀽鏂规硶) + "']").attr("selected", true);
                                 $('#HQCNote1' + (i + 1)).find("option[value='" + result.data[i].HQCNote1 + "']").attr("selected", true);
                                 $('#HQCNote2' + (i + 1)).find("option[value='" + result.data[i].HQCNote2 + "']").attr("selected", true);
                                 $('#HQCNote3' + (i + 1)).find("option[value='" + result.data[i].HQCNote3 + "']").attr("selected", true);
                                 $('#HQCNote4' + (i + 1)).find("option[value='" + result.data[i].HQCNote4 + "']").attr("selected", true);
                                 $('#HQCNote5' + (i + 1)).find("option[value='" + result.data[i].HQCNote5 + "']").attr("selected", true);
+                                $('#HQCNote6' + (i + 1)).find("option[value='" + result.data[i].HQCNote6 + "']").attr("selected", true);
                             }
                             form.render('select');
 
@@ -654,6 +725,7 @@
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
                 var NewRow = {
+                    "HInspectMethodID": 0, "HInspectMethodName": "", "HUpLimit": '', "HDownLimit": '', "HInspectVal": '', "HAnalysisMethod": "",
                     "HQCCheckItemID": 0, "HQCStd": " ", "HQCNote1": " ", "HQCNote2": " ", "HQCNote3": "  ", "HQCNote4": "  ", "HQCNote5": " ", "HQCNote6": " ", "HQCNote7": " ", "HQCNote8": " ", "HQCNote9": " ", "HQCNote10": " ", "HRemark": " "
                     , "HQCNote1_SN": $("#HQCNote1_SN").val() || '', "HQCNote2_SN": $("#HQCNote2_SN").val() || '', "HQCNote3_SN": $("#HQCNote3_SN").val() || '', "HQCNote4_SN": $("#HQCNote4_SN").val() || '', "HQCNote5_SN": $("#HQCNote5_SN").val() || '', "HQCNote6_SN": $("#HQCNote6_SN").val() || '', "HQCNote7_SN": $("#HQCNote7_SN").val() || '', "HQCNote8_SN": $("#HQCNote8_SN").val() || '', "HQCNote9_SN": $("#HQCNote9_SN").val() || '', "HQCNote10_SN": $("#HQCNote10_SN").val() || ''
                 };
@@ -663,6 +735,11 @@
                         table.cache["mainTable"].push(NewRow);
                         option.data = table.cache["mainTable"];
                         table.render(option);
+                        for (var i = 1; i <= option.data.length; i++) {
+/*                            $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+                            $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                        }
+                        form.render('select');
                         rows++;
                         layer.msg('澧炲姞涓�琛屾寜閽紒')
                         break;
@@ -680,6 +757,11 @@
                             table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
                             option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
                             table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                            for (var i = 1; i <= option.data.length; i++) {
+ /*                               $('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);*/
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                            form.render('select');
                             //layer.alert(copyrow);
                         }
                         break;
@@ -962,7 +1044,53 @@
                                 }
                             });
                         }
+                        //if (obj.event == 'HInspectMethodName')  //
+                        //{
+                        //    //椤甸潰灞�-鑷畾涔�
+                        //    layer.open({
+                        //        type: 2,
+                        //        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        //        title: '妫�楠屾柟娉曞垪琛�',
+                        //        closeBtn: 1,
+                        //        shift: 2,
+                        //        area: ['80%', '80%'],
+                        //        maxmin: true,
+                        //        content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=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('璇烽�夋嫨鏁版嵁');
+                        //            }
+                        //            obj.update({
+                        //                HInspectMethodID: checkStatus.data[0].HItemID,
+                        //                HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+                        //            });
+                        //            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                        //        }
+                        //        , btn2: function (index, layero) {
+                        //            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //            //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        //        },
+                        //        end: function () {
+                        //            if (OptionData[0].绂佺敤鏍囪 != '鏄�' || OptionData[0].瀹℃牳浜� != "") {
+                        //                //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        //                obj.update({
+                        //                    "HInspectMethodID": OptionData[0].HItemID
+                        //                    , "HInspectMethodName": OptionData[0].妫�楠屾柟娉曞悕绉�
+                        //                })
+                        //            } else {
+                        //                layer.msg("璇ユ楠屾柟娉曞凡绂佺敤鏈鏍革紝璇烽噸鏂伴�夋嫨!");
+                        //            }
+                        //        },
+                        //        success: function (layero, index) {
+
+                        //        }
+                        //    });
+                        //}
                         obj.event = "";
                         return false;
 
@@ -974,6 +1102,43 @@
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'HInspectMethodName') {
+                    $(document).off('keydown').on('keydown', function (e) {
+                        if (e.key === "F7" || e.keyCode === 118) {
+                            // 闃绘榛樿琛屼负
+                            e.preventDefault();
+
+                            // 鎵撳紑妫�楠屾柟娉曢�夋嫨绐楀彛
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                title: '妫�楠屾柟娉曞垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_InspectMethod.html?openType=2', 'yes'],
+                                btn: ['纭畾', '鍙栨秷'],
+                                btn1: function (index, layero) {
+                                    var iframeWindow = window['layui-layer-iframe' + index];
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    // 鏇存柊鏁版嵁
+                                    obj.update({
+                                        HInspectMethodID: checkStatus.data[0].HItemID,
+                                        HInspectMethodName: checkStatus.data[0].妫�楠屾柟娉曞悕绉�,
+                                    });
+                                    layer.close(index);
+                                }
+                            });
+
+                            return false;
+                        }
+                    });
+                }
                 if (obj.event === 'del') {
                     layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
                         console.log("绱㈠紩涓�:" + rowIndex);
@@ -1320,18 +1485,33 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             for (var i = 0; i < result.data.length; i++) {
+                                var analysisMethodValue = data[i].HAnalysisMethod;
+                                var analysisMethodText = "";
+                                if (analysisMethodValue == "1" || analysisMethodValue == 1) {
+                                    analysisMethodText = "瀹氭�у垎鏋�";
+                                } else if (analysisMethodValue == "2" || analysisMethodValue == 2) {
+                                    analysisMethodText = "瀹氶噺鍒嗘瀽";
+                                } else if (analysisMethodValue == "3" || analysisMethodValue == 3) {
+                                    analysisMethodText = "鍏朵粬鍒嗘瀽";
+                                }
                                 //瀛愯〃  璧嬪��
                                 rowdata.push({
+                                    //"HAnalysisMethod": data[i].HAnalysisMethod == "瀹氭�у垎鏋�" ? 1 : (data[i].HAnalysisMethod == "瀹氶噺鍒嗘瀽" ? 2 : 3),
+                                    "HAnalysisMethod": analysisMethodValue ,
                                     "妫�楠岄」鐩垎绫�": data[i]["妫�楠岄」鐩垎绫�"], "HQCCheckItemID": data[i]["HQCCheckItemID"], "HQCCheckItemName": data[i]["妫�楠岄」鐩�"],
                                     "HQCStd": "",
                                     "HQCNote1": "",
@@ -1354,11 +1534,25 @@
                                     "HQCNote7_SN": "",
                                     "HQCNote8_SN": "",
                                     "HQCNote9_SN": "",
-                                    "HQCNote10_SN": ""
+                                    "HQCNote10_SN": "",
+                                    "HInspectMethodID": data[i].HInspectMethodID, "HInspectMethodName": data[i].妫�楠屾柟娉�, "HInspectVal": data[i].妫�娴嬪��, "HUpLimit": data[i].涓婇檺鍊�, "HDownLimit": data[i].涓嬮檺鍊�
                                 });
                             }
                             option.data = rowdata;
                             table.render(option);
+                            setTimeout(function () {
+                                var tableData = table.cache['mainTable'];
+                                if (tableData) {
+                                    for (var i = 0; i < tableData.length; i++) {
+                                        var selectElem = $('#HAnalysisMethod' + (i + 1));
+                                        if (selectElem.length) {
+                                            // 璁剧疆涓嬫媺妗嗙殑閫変腑鍊�
+                                            selectElem.val(tableData[i].HAnalysisMethod || '');
+                                        }
+                                    }
+                                    form.render('select');
+                                }
+                            }, 200); 
                         }
                     }
                 })
@@ -1765,6 +1959,7 @@
                         tableData[i].HQCNote3_SN = $("#HQCNote3_SN").val() || '';
                         tableData[i].HQCNote4_SN = $("#HQCNote4_SN").val() || '';
                         tableData[i].HQCNote5_SN = $("#HQCNote5_SN").val() || '';
+                        tableData[i].HQCNote6_SN = $("#HQCNote6_SN").val() || '';
                     }
                     table.reload('mainTable', {
                         data: tableData
@@ -1775,20 +1970,24 @@
             // 鍚屾瀛愯〃SN鐮佸埌琛ㄥご
             function syncSubTableToHeader() {
                 var tableData = table.cache['mainTable'];
-                if (tableData && tableData.length > 0) {
+                var isStep = 0;
+                if ($("#HQCNote1_SN").val() != "" || $("#HQCNote1_SN").val() != null || $("#HQCNote2_SN").val() != "" || $("#HQCNote3_SN").val() != "" || $("#HQCNote4_SN").val() != "")
+                    isStep = 1
+                if (tableData && tableData.length > 0 && isStep != 1) {
                     var firstRow = tableData[0];
                     $("#HQCNote1_SN").val(firstRow.HQCNote1_SN || '');
                     $("#HQCNote2_SN").val(firstRow.HQCNote2_SN || '');
                     $("#HQCNote3_SN").val(firstRow.HQCNote3_SN || '');
                     $("#HQCNote4_SN").val(firstRow.HQCNote4_SN || '');
                     $("#HQCNote5_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote6_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote7_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote8_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote9_SN").val(firstRow.HQCNote5_SN || '');
-                    $("#HQCNote10_SN").val(firstRow.HQCNote5_SN || '');
+                    $("#HQCNote6_SN").val(firstRow.HQCNote6_SN || '');
+                    $("#HQCNote7_SN").val(firstRow.HQCNote7_SN || '');
+                    $("#HQCNote8_SN").val(firstRow.HQCNote8_SN || '');
+                    $("#HQCNote9_SN").val(firstRow.HQCNote9_SN || '');
+                    $("#HQCNote10_SN").val(firstRow.HQCNote10_SN || '');
                 }
             }
+
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 syncHeaderToSubTable();
@@ -1934,10 +2133,18 @@
                                     }
                                     option.cols[0][i + 1]["fixed"] = "left";
                                 }
-                            }
+                            } 
                             table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                        
                         } else {
                             table.render(option);
+                            for (var i = 1; i <= option.data.length; i++) {
+                                $('#HAnalysisMethod' + i + '').find("option[value='" + option.data[i - 1].HAnalysisMethod + "']").attr("selected", true);
+                            }
+                        
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1955,7 +2162,17 @@
                     //}
                 }
             });
-
+            //琛岄�夋嫨澶勭悊锛堟槸鍚﹀澶栵級
+            form.on('select(HAnalysisMethod)', 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.HAnalysisMethod = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
             //琛岄�夋嫨澶勭悊锛堟楠岃褰�1锛�
             form.on('select(HQCNote1)', function (data) {
                 //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
@@ -2011,6 +2228,17 @@
                     }
                 });
             });
+            //琛岄�夋嫨澶勭悊锛堟楠岃褰�6锛�
+            form.on('select(HQCNote6)', 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.HQCNote6 = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
 
         });
         //瀹氫箟鍏ㄥ眬鍙橀噺
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index e9d0043..f24b840 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -785,18 +785,20 @@
                     LoadingInformation2();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
                 }
-                //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄩ妫�
+                //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄥ贰妫�
                 else if (HSouceBillType == 3790) {
                     //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
                     LoadingInformation_StationInBill();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -807,7 +809,8 @@
                     LoadingInformation3();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -818,7 +821,8 @@
                     LoadingInformation_ICMO();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -829,7 +833,8 @@
                     LoadingInformation_ProcExchange();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -870,6 +875,7 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
                             $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.HBillType);
@@ -2106,10 +2112,11 @@
 
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
@@ -2221,10 +2228,11 @@
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "宸℃鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
@@ -2652,16 +2660,16 @@
                         , { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
                         , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                         , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
-                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
-                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
-                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
                         , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
                         , { field: 'HTargetVal', title: '鐩爣鍊�' }                        
                         , { field: 'HUpLimit', title: '涓婇檺鍊�' }
                         , { field: 'HDownLimit', title: '涓嬮檺鍊�'  }
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
                         , { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
-                        , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
+                        , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }                       
+                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                        , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
+                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
 
                         , { field: 'HSampleSchemeID', title: '鎶芥牱鏂规ID', edit: 'text', hide: true }
                         , { field: 'HSampleSchemeName', title: '鎶芥牱鏂规', edit: 'text', hide: true }
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 bef86b8..7e132f5 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"
@@ -841,7 +841,20 @@
                         LoadingInformation2();
                         //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                         if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                            (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
+                            //鑷姩甯﹀嚭妫�楠屾柟妗�
+                            GetCheckItemID();
+                        }
+                    }
+                    //宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛ㄦ湯妫�
+                    else if (HSouceBillType == 3790) {
+                        //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅
+                        LoadingInformation_StationInBill();
+                        //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
+                        if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                            (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                             //鑷姩甯﹀嚭妫�楠屾柟妗�
                             GetCheckItemID();
                         }
@@ -852,7 +865,8 @@
                         LoadingInformation_StationOutBill();
                         //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                         if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                            (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                             //鑷姩甯﹀嚭妫�楠屾柟妗�
                             GetCheckItemID();
                         }
@@ -862,7 +876,8 @@
                         LoadingInformation_ICMO();
                         //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                         if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                            (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                             //鑷姩甯﹀嚭妫�楠屾柟妗�
                             GetCheckItemID();
                         }
@@ -873,7 +888,8 @@
                         LoadingInformation_ProcExchange();
                         //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                         if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                            (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                            (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                             //鑷姩甯﹀嚭妫�楠屾柟妗�
                             GetCheckItemID();
                         }
@@ -961,10 +977,13 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.HBillType);
                             $("#HMainSourceInterID").val(data.hmainid);
                             $("#HProcID").val(data.HProcID);
+                            $("#HProcName").val(data.褰撳墠宸ュ簭);
                             $("#HICMOEntryID").val(HICMOEntryID);
                             $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
                             $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
@@ -1069,7 +1088,50 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            }           
+            }
+
+            //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅(杩涚珯鎺ユ敹鍗�)
+            function LoadingInformation_StationInBill() {
+                var wait = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/get_StationInBill',
+                    type: "GET",
+                    async: false,
+                    data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        var data = result.data[0];
+                        if (result.count == 1) {
+                            $("#HProcExchBillNo").val(data.娴佽浆鍗″彿);
+                            $("#HProcExchInterID").val(data.HProcExchInterID);
+                            $("#HProcExchEntryID").val(data.HProcExchEntryID);
+                            $("#HProcExchQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HICMOBillNo").val(data.浠诲姟鍗�);
+                            $("#HICMOInterID").val(data.HICMOInterID);
+                            $("#HICMOQty").val(data.HICMOQty);
+                            $("#HSourceName").val(data.鐢熶骇璧勬簮);
+                            $("#HSourceID").val(data.HSourceID);
+                            $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
+                            $("#HMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
+                            $("#HMainSourceBillType").val(data.HBillType);
+                            $("#HMainSourceInterID").val(data.HInterID);
+                            $("#HICMOEntryID").val(data.HICMOEntryID);
+                            $("#HQCSchemeName").val(data.妫�楠屾柟妗堝悕绉�);
+                            $("#HQCSchemeID").val(data.妫�楠屾柟妗圛D);
+                            $("#HProcName").val(data.褰撳墠宸ュ簭);
+                            //鑾峰彇琛ㄤ綋妫�楠岄」鐩俊鎭�
+                            get_CheckItem();
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -2275,12 +2337,16 @@
 
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏈欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             rowdata_Value = [];
                             var data = result.data;
@@ -2396,10 +2462,11 @@
 
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏈欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
@@ -2749,6 +2816,10 @@
                         , { field: 'HResult', title: '缁撹', templet: '#HResult' }
                         , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
                         , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
+                        , { field: 'HTargetVal', title: '鐩爣鍊�' }                     
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�' }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
                         , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
                         , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
                         , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
@@ -2756,13 +2827,8 @@
                         , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
                         , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
                         , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
-                        //, { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
                         , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
-                        , { field: 'HTargetVal', title: '鐩爣鍊�' }
-                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
-                        , { field: 'HUpLimit', title: '涓婇檺鍊�' }
-                        , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
                         , { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
                         , { field: 'HAvg', title: '骞冲潎鍊�', edit: 'text', totalRow: true }
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 e74d451..3c3f8f1 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"
@@ -2569,13 +2569,17 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 var HBatchQty = $("#HQty").val() == 0 ? $("#HICMOQty").val() : $("#HQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏉ユ枡妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
@@ -2760,11 +2764,12 @@
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "鏉ユ枡妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 13a398c..ade7e56 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -103,6 +103,19 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
+                                                <label class="layui-form-label">妫�楠屽崟绫诲瀷</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HCheckBillType" id="HCheckBillType" lay-verify="HCheckBillType">
+                                                        <option value="棣栦欢妫�鏂规">棣栦欢妫�鏂规</option>
+                                                        <option value="鏈欢妫�鏂规">鏈欢妫�鏂规</option>
+                                                        <option value="宸℃鏂规">宸℃鏂规</option>
+                                                        <option value="鍑哄巶妫�鏂规">鍑哄巶妫�鏂规</option>
+                                                        <option value="鏉ユ枡妫�鏂规">鏉ユ枡妫�鏂规</option>
+                                                        <option value="鐢熶骇鍏ュ簱妫�鏂规">鐢熶骇鍏ュ簱妫�鏂规</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">宸ュ簭</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
@@ -1400,7 +1413,7 @@
                                 , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : Format(new Date(data.鍏抽棴鏃ユ湡), "yyyy-MM-dd")
                                 , "HDeleteMan": data.浣滃簾浜�
                                 , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : Format(new Date(data.浣滃簾鏃ユ湡), "yyyy-MM-dd")
-
+                                , "HCheckBillType": data.HCheckBillType
                             });
                             //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
                             HOrgIDBar = sessionStorage["OrganizationID"];
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MeasuringToolsyWarningReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MeasuringToolsyWarningReport.html"
new file mode 100644
index 0000000..3ea3dfb
--- /dev/null
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_MeasuringToolsyWarningReport.html"
@@ -0,0 +1,397 @@
+锘�<!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>
+    <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid" style="width:100%;height:100%;">
+        <div class="layui-col-md12" style="width:100%;height:100%;">
+            <div class="layui-card" style="padding: 1px;width:100%;height:100%;">
+                <div class="layui-card-body" style="padding: 1px;width:100%;height:100%;">
+                    <form class="layui-form" action="" lay-filter="component-form-group" style="width:100%;height:100%;">
+                        <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" id="HNumber"  name="HNumber" 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" id="HName" name="HName" 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" id="HDayWarning" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>                        
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                               
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙ｆā鍧�
+        }).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 = "QC_MeasuringToolsyWarningReport";
+            //#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 'btn_Edit': btn_Edit();
+                        break;
+                    //闅愯棌鍒楄缃�
+                    case 'HideColumn':
+                        get_HideColumn();
+                        break;
+                };
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(btn-exit)', function (data) {
+                Pub_Close(2);
+            });
+
+            //鍒楄缃寜閽�
+            form.on('submit(HideColumn)', function (data) {
+                get_HideColumn();
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {                           
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_FastQuery();                     
+           }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {              
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-90'
+                    , totalRow: true
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+
+                }
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+              
+                var wait = layer.load();//閬僵
+                $.ajax({
+                    url: GetWEBURL() + '/QC_CustomerAppealReport/GetQC_MeasuringToolsReport',
+                    type: "GET",
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"]   },
+                    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 });
+                            }
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '姹囨��' });
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            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 {
+                                    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, totalRow: true, width: 200 });
+                                    }
+                                }
+                            }                         
+
+                            option.cols = [col];
+                            option.data = data1.data;
+
+                            table.render(option);
+                            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 HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HDayWarning = $("#HDayWarning").val();
+                sWhere = {
+                    HNumber: HNumber
+                    , HName: HName
+                    , HDayWarning: HDayWarning
+                }
+                get_Display(JSON.stringify(sWhere));
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";               
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HDayWarning").val("");
+                sWhere = " ";
+                get_FastQuery();
+            }
+
+            //淇敼
+            function btn_Edit() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID;
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍣ㄥ叿妗ｆ鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {                            
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+
+
+            //闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            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;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            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\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index cd7e9ad..be164ef 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -829,7 +829,8 @@
                     LoadingInformation_StationInBill();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -851,7 +852,8 @@
                     LoadingInformation_ICMO();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -862,7 +864,8 @@
                     LoadingInformation_ProcExchange();
                     //瀹㈡埛涓烘柉鑾皵锛岃繘鍏ユ寜鐓ц川妫�鏂规琛ㄥご涓婄殑鐗╂枡缁戝畾甯﹀嚭榛樿鏂规
                     if ((sessionStorage["OrganizationID"] == "7667152" && sessionStorage["Organization"] == "CMR Technology Mexico S.A. de C.V.") ||
-                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�")) {
+                        (sessionStorage["OrganizationID"] == "100199" && sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") ||
+                        (sessionStorage["OrganizationID"] == "100007" && sessionStorage["Organization"] == "浜嬩笟涓�澶�")) {
                         //鑷姩甯﹀嚭妫�楠屾柟妗�
                         GetCheckItemID();
                     }
@@ -904,6 +907,7 @@
                             $("#HSourceName").val(data.鐢熶骇璧勬簮);
                             $("#HSourceID").val(data.HSourceID);
                             $("#HMaterID").val(data.HMaterID);
+                            $("#HMaterNumber").val(data.浜у搧浠ｇ爜);
                             $("#HMaterName").val(data.浜у搧鍚嶇О);
                             $("#HMainSourceBillNo").val(data.鍗曟嵁鍙�);
                             $("#HMainSourceBillType").val(data.HBillType);
@@ -1712,23 +1716,12 @@
             //#endregion
 
             //淇濆瓨
-            async function set_SaveBill(data) {
+            function set_SaveBill(data) {
                 //璧嬪�兼渶鍚庝竴涓�変腑琛岀殑鏁版嵁缁檕ption.data
                 //Assignment(LastIndex, LastIndex);
                 //淇濆瓨鏈�鍚庝竴娆＄偣鍑昏鐨勬楠屽��
+                set_SaveValue($("#HEntryID").val());
 
-                try {
-                    var rownum = $("#HEntryID").val();
-
-                    rowFun = table.cache["mainTable"][rownum].HAnalysisMethod;
-                    if (rowFun == "")
-                        throw error
-                    await set_SaveValue($("#HEntryID").val(), rowFun);
-                } catch (error) {
-                   
-                    layer.msg('鐢ㄦ埛鍙栨秷浜嗘楠屽�间繚瀛�');
-                    return;
-                }
                 if ($("#HICMOQty").val() == "" || $("#HICMOQty").val() <= 0) {
                     layer.msg("浠诲姟鍗曟暟閲忎笉鑳戒负绌轰笖涓嶈兘灏忎簬绛変簬0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
@@ -1835,6 +1828,7 @@
                     }
                 });
             }
+            
 
             //缂栬緫鏃跺姞杞借〃澶�
             function RoadBillMain(linterid) {
@@ -2305,13 +2299,17 @@
             //#region 銆愰�夋楠屾柟妗堣幏鍙栬〃浣撴楠岄」鐩俊鎭��
             function get_CheckItem() {
                 var HBatchQty = $("#HProcExchQty").val() == 0 ? $("#HICMOQty").val() : $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "棣栦欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
+                            //妫�楠屾柟妗�
+                            $("#HQCSchemeID").val(result.data[0].hmainid);
+                            $("#HQCSchemeName").val(result.data[0].妫�楠屾柟妗堝悕绉�);
                             var rowdata = [];
                             var data = result.data;
                             rowdata_Value = [];
@@ -2365,6 +2363,8 @@
 
                             //鎼哄甫鍑烘娊鏍锋柟妗�
                             ReturnSampleScheme(data);
+                        } else {
+                            layer.msg(result.Message);
                         }
                     }
                 })
@@ -2422,11 +2422,12 @@
             //鐢ㄤ簬鍙屽嚮妫�楠屾柟妗堜娇鐢�
             window.get_CheckItem1 = function () {
                 var HBatchQty = $("#HProcExchQty").val();
+                var HMaterID = $("#HMaterID").val();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetCheckItemByCheckProjectID",
                     type: "GET",
                     async: false,
-                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty },
+                    data: { "CheckProjectID": $("#HQCSchemeID").val() == '' ? 0 : $("#HQCSchemeID").val(), "HBatchQty": HBatchQty, "HMaterID": HMaterID, "HBillType": "棣栦欢妫�鏂规" },
                     success: function (result) {
                         if (result.code == 1) {
                             var rowdata = [];
@@ -2800,7 +2801,7 @@
                         { type: 'checkbox', totalRowText: '鍚堣琛�' }
                         , { type: 'numbers', title: '搴忓彿', totalRow: true }
                         , { field: 'HQCCheckItemID', title: 'HQCCheckItemID', hide: true }
-                        , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�' }
+                        , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�',width:100 }
                         , { field: '妫�楠岄」鐩�', title: '妫�楠岄」鐩�', edit: 'text', event: 'HQCCheckItemID' }
                         , { field: 'HInspectInstruMentID', title: 'HInspectInstruMentID', hide: true }
                         , {
@@ -2811,20 +2812,22 @@
                         , { field: '妫�楠屼华鍣�', title: '妫�楠屼华鍣�', edit: 'text', event: 'HInspectInstruMentID' }
                         , { field: 'HResult', title: '缁撹', templet: '#HResult', event: 'HResult' }
                         , { field: 'HAnalysisMethod', title: '鍒嗘瀽鏂规硶', templet: '#HAnalysisMethod', event: 'HAnalysisMethod' }
+                     
+                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }                      
+                        , { field: 'HTargetVal', title: '鐩爣鍊�' }
+                        , { field: 'HUpLimit', title: '涓婇檺鍊�' }
+                        , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
+
+                        , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
+                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
                         , { field: 'HQualityStdID', title: '璐ㄩ噺鏍囧噯ID', edit: 'text', hide: true }
                         , { field: 'HQualityStdName', title: '璐ㄩ噺鏍囧噯', edit: 'text', event: 'HQualityStdName' }
                         , { field: 'HInspectMethodID', title: '妫�楠屾柟娉旾D', edit: 'text', hide: true }
                         , { field: 'HInspectMethodName', title: '妫�楠屾柟娉�', edit: 'text', event: 'HInspectMethodName', style: 'white-space: nowrap; overflow: hidden;text-overflow: ellipsis;' }
                         , { field: 'HInspectBasisID', title: '妫�楠屼緷鎹甀D', edit: 'text', hide: true }
                         , { field: 'HInspectBasisName', title: '妫�楠屼緷鎹�', edit: 'text', event: 'HInspectBasisName' }
-                        , { field: 'HKeyInspect', title: '閲嶇偣妫�鏌�', templet: '#HKeyInspect', unresize: false }
-                        , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
                         , { field: 'HUnit', title: '鍗曚綅', edit: 'text' }
-                        , { field: 'HInspectVal', title: '妫�楠屽��', edit: 'text' }
-                        , { field: 'HQCNote', title: '妫�楠岃褰�', edit: 'text' }
-                        , { field: 'HTargetVal', title: '鐩爣鍊�' }
-                        , { field: 'HUpLimit', title: '涓婇檺鍊�' }
-                        , { field: 'HDownLimit', title: '涓嬮檺鍊�' }
                         , { field: 'HCompareSymbol', title: '姣旇緝绗�' }
                         , { field: 'HMax', title: '鏈�澶у��', edit: 'text', totalRow: true }
                         , { field: 'HMin', title: '鏈�灏忓��', edit: 'text', totalRow: true }
@@ -3164,9 +3167,9 @@
                 var table_value = table.cache['ValueTable'];
 
                 if (OperationType == 3) {
-                    set_SaveValue(Number(nowindex) + Number(1), rowFun);
+                    set_SaveValue(Number(nowindex) + Number(1));
                 } else {
-                    set_SaveValue(dataindex + 1, rowFun);
+                    set_SaveValue(dataindex + 1);
                 }
                 //璧嬪�间笌鍥炴樉
                 if ($("#HSampleSchemeID").val() != "0") {
@@ -3195,7 +3198,9 @@
                 }
 
                 //鑷姩璺宠浆鍒版娴嬪�奸〉绛�
-                element.tabChange('bottomTable', '3');  //璺宠浆椤电
+                if (sessionStorage["OrganizationID"] !="100007") {
+                    element.tabChange('bottomTable', '3');  //璺宠浆椤电
+                }               
             });
             //#endregion
 
@@ -4239,144 +4244,144 @@
                 set_SaveBill(data);
             });
             //妫�楠屽�间繚瀛� - 杩斿洖Promise
-            function set_SaveValue(dataindex, rowFun) {
-                return new Promise((resolve, reject) => {
-                    var hasEmptyRow = false;
-                    var emptyRowNumbers = [];
+            //function set_SaveValue(dataindex, rowFun) {
+            //    return new Promise((resolve, reject) => {
+            //        var hasEmptyRow = false;
+            //        var emptyRowNumbers = [];
 
-                    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-                        var row = table.cache['ValueTable'][i];
-                        if (rowFun == 2) {
-                            if (
-                                (!row.HInSpectValue || row.HInSpectValue === "")) {
-                                hasEmptyRow = true;
-                                emptyRowNumbers.push(i + 1);
-                            }
-                        }
-                    }
-
-
-                    if (hasEmptyRow) {
-                        var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
-                        layer.confirm(confirmMsg, {
-                            icon: 3,
-                            title: '鎻愮ず',
-                            btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
-                        }, function (index) {
-
-                            layer.close(index);
-                            proceedWithSave(dataindex).then(resolve).catch(reject);
-                        }, function (index) {
-                            ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
-                            //var dataindex = $("#HEntryID").val() - 1;
-                            layer.close(index);
-                            //EchoValue();
-                            layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
-                            //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
-                        });
-                    } else {
-
-                        proceedWithSave(dataindex).then(resolve).catch(reject);
-                    }
-                });
-            }
-
-
-            function proceedWithSave(dataindex) {
-                return new Promise((resolve, reject) => {
-                    if (OperationType == 3) {
-                        EchoValue();
-                    }
-
-                    
-                    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-                        if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
-                            table.cache['ValueTable'][i].HInSpectValueB = 0
-                        }
-                        if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
-                            table.cache['ValueTable'][i].HInSpectValueT = 0
-                        }
-                        if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
-                            table.cache['ValueTable'][i].HInSpectValue = 0
-                        }
-                    }
-
-                    var sValueTable = JSON.stringify(table.cache['ValueTable']);
-                    var HInterID = $("#HInterID").val();
-                    var HEntryID = dataindex;
-                    var msg = sValueTable + ";" + HInterID + ";" + HEntryID
-
-                    var index = layer.load();
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
-                        async: true,
-                        data: { "msg": msg },
-                        dataType: "json",
-                        success: function (data) {
-                            layer.close(index);
-                            if (data.count == 1) {
-                                layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
-                                resolve(); // 鎴愬姛鏃秗esolve
-                            } else {
-                                layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
-                        }
-                    });
-                });
-            }
-            //妫�楠屽�间繚瀛�
-            //function set_SaveValue(dataindex) {
-            //    if (OperationType == 3) {
-            //        EchoValue();
-            //    }
-            //    for (let i = 0; i < table.cache['ValueTable'].length; i++) {
-            //        if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
-            //            table.cache['ValueTable'][i].HInSpectValueB = 0
-            //        }
-            //        if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
-            //            table.cache['ValueTable'][i].HInSpectValueT = 0
-            //        }
-            //        if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
-            //            table.cache['ValueTable'][i].HInSpectValue = 0
-            //        }
-            //    }
-
-            //    var sValueTable = JSON.stringify(table.cache['ValueTable']);
-            //    var HInterID = $("#HInterID").val();
-            //    var HEntryID = dataindex;
-            //    var msg = sValueTable + ";" + HInterID + ";" + HEntryID
-
-            //    var index = layer.load();
-            //    $.ajax({
-            //        type: "POST",
-            //        url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
-            //        async: false,
-            //        data: { "msg": msg },
-            //        dataType: "json",
-            //        success: function (data) {
-            //            if (data.count == 1) {
-            //                layer.close(index);
-            //                //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+            //        for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+            //            var row = table.cache['ValueTable'][i];
+            //            if (rowFun == 2) {
+            //                if (
+            //                    (!row.HInSpectValue || row.HInSpectValue === "")) {
+            //                    hasEmptyRow = true;
+            //                    emptyRowNumbers.push(i + 1);
+            //                }
             //            }
-            //            else {
+            //        }
+
+
+            //        if (hasEmptyRow) {
+            //            var confirmMsg = "妫�楠屽�艰〃鏍间腑瀛樺湪绌鸿锛堢 " + emptyRowNumbers.join(", ") + " 琛岋級锛屾槸鍚︾户缁繚瀛橈紵";
+            //            layer.confirm(confirmMsg, {
+            //                icon: 3,
+            //                title: '鎻愮ず',
+            //                btn: ['纭淇濆瓨', '鍙栨秷淇濆瓨']
+            //            }, function (index) {
+
             //                layer.close(index);
-            //                layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-            //            }
-            //        },
-            //        error: function (err) {
-            //            layer.close(index);
-            //            layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                proceedWithSave(dataindex).then(resolve).catch(reject);
+            //            }, function (index) {
+            //                ////鑾峰彇涓婃鎵�鍦ㄨ涓嬫爣
+            //                //var dataindex = $("#HEntryID").val() - 1;
+            //                layer.close(index);
+            //                //EchoValue();
+            //                layer.msg('宸插彇娑堜繚瀛橈紝璇峰畬鍠勬暟鎹悗閲嶆柊鎿嶄綔', { icon: 2 });
+            //                //reject(new Error('鐢ㄦ埛鍙栨秷浜嗕繚瀛�'));
+            //            });
+            //        } else {
+
+            //            proceedWithSave(dataindex).then(resolve).catch(reject);
             //        }
             //    });
             //}
 
+
+            //function proceedWithSave(dataindex) {
+            //    return new Promise((resolve, reject) => {
+            //        if (OperationType == 3) {
+            //            EchoValue();
+            //        }
+
+                    
+            //        for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+            //            if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+            //                table.cache['ValueTable'][i].HInSpectValueB = 0
+            //            }
+            //            if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+            //                table.cache['ValueTable'][i].HInSpectValueT = 0
+            //            }
+            //            if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+            //                table.cache['ValueTable'][i].HInSpectValue = 0
+            //            }
+            //        }
+
+            //        var sValueTable = JSON.stringify(table.cache['ValueTable']);
+            //        var HInterID = $("#HInterID").val();
+            //        var HEntryID = dataindex;
+            //        var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+            //        var index = layer.load();
+            //        $.ajax({
+            //            type: "POST",
+            //            url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+            //            async: true,
+            //            data: { "msg": msg },
+            //            dataType: "json",
+            //            success: function (data) {
+            //                layer.close(index);
+            //                if (data.count == 1) {
+            //                    layer.msg('妫�楠屽�间繚瀛樻垚鍔�', { icon: 1 });
+            //                    resolve(); // 鎴愬姛鏃秗esolve
+            //                } else {
+            //                    layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                    reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + data.Message));
+            //                }
+            //            },
+            //            error: function (err) {
+            //                layer.close(index);
+            //                layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //                reject(new Error("妫�楠屽�间繚瀛橀敊璇細" + err));
+            //            }
+            //        });
+            //    });
+            //}
+            //妫�楠屽�间繚瀛�
+            function set_SaveValue(dataindex) {
+                if (OperationType == 3) {
+                    EchoValue();
+                }
+                for (let i = 0; i < table.cache['ValueTable'].length; i++) {
+                    if (table.cache['ValueTable'][i].HInSpectValueB == "" || table.cache['ValueTable'][i].HInSpectValueB == null) {
+                        table.cache['ValueTable'][i].HInSpectValueB = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValueT == "" || table.cache['ValueTable'][i].HInSpectValueT == null) {
+                        table.cache['ValueTable'][i].HInSpectValueT = 0
+                    }
+                    if (table.cache['ValueTable'][i].HInSpectValue == "" || table.cache['ValueTable'][i].HInSpectValue == null) {
+                        table.cache['ValueTable'][i].HInSpectValue = 0
+                    }
+                }
+
+                var sValueTable = JSON.stringify(table.cache['ValueTable']);
+                var HInterID = $("#HInterID").val();
+                var HEntryID = dataindex;
+                var msg = sValueTable + ";" + HInterID + ";" + HEntryID
+
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/QC_FirstPieceCheckBill/set_SaveValue",
+                    async: false,
+                    data: { "msg": msg },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.close(index);
+                            //$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg("妫�楠屽�间繚瀛橀敊璇紒" + data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("妫�楠屽�间繚瀛橀敊璇�:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+
             //鏍规嵁鐢熶骇璧勬簮鎴栬�� 宸ュ簭 鏌ヨ鐢熶骇宸ュ崟淇℃伅
             function get_ICMOBillStatusList() {
                 var sWhere = "";
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 32714ef..f1a280f 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"
@@ -116,7 +116,7 @@
                                         <input type="text" style="border-radius: 50px;width: 140%;" name="瀛愪欢鏉＄爜" id="SubBarcode" autocomplete="off" placeholder="璇疯緭鍏ュ瓙浠舵潯鐮�" class="layui-input">
                                     </div>
                                 </div>
-                                <div class="" hidden="hidden">
+                                <div class="">
                                     <label class="layui-inline" style="width:60px;" id="BT_HMixedBox"> 鏄惁娣风</label>
                                     <div class="layui-inline">
                                         <input type="checkbox" id="HMixedBox" name="HMixedBox" lay-skin="primary" value="" lay-filter="HMixedBox">
@@ -378,6 +378,12 @@
             var icmoQty = 0;//娴佽浆鍗℃暟閲�
             var icmoQtyNow = 0;//娴佽浆鍗″墿浣欐暟閲�
 
+            var batch1 = ''; // 绗竴涓壒娆�
+            var batch2 = ''; // 绗簩涓壒娆�
+            var batch3 = ''; // 绗笁涓壒娆★紙澶囩敤锛�
+            var currentBatchCount = 0; // 褰撳墠宸茶褰曠殑鎵规鏁伴噺
+
+
             $("#HDateNow").val(time);//鍔犺浇褰撳墠鏃堕棿
             $("#zxQty").focus();
             $("#HOrgID").val(sessionStorage["OrganizationID"]);
@@ -492,11 +498,11 @@
                 }
             });
 
-
+            //娌℃湁娴佽浆鍗″惎鐢ㄧ殑
             form.on('checkbox(HMixedBox)', function (obj) {
-                if (icmoQtyNow == 0) {
+                if (zxQty == 0) {
                     playSound();
-                    layer.msg("鍓╀綑鏁伴噺涓�" + icmoQtyNow + ",涓嶅厑璁告贩绠憋紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    layer.msg("瑁呯鏁伴噺涓�" + zxQty + ",涓嶅厑璁告贩绠憋紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                     $("input[name='HMixedBox']").prop("checked", false);
                     form.render('checkbox');
                     return;
@@ -508,6 +514,22 @@
                 }
 
             });
+            //鏈夋祦杞崱鍚敤鐨�
+            //form.on('checkbox(HMixedBox)', function (obj) {
+            //    if (icmoQtyNow == 0) {
+            //        playSound();
+            //        layer.msg("鍓╀綑鏁伴噺涓�" + icmoQtyNow + ",涓嶅厑璁告贩绠憋紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+            //        $("input[name='HMixedBox']").prop("checked", false);
+            //        form.render('checkbox');
+            //        return;
+            //    }
+            //    if (obj.value == "") {
+            //        $("#HMixedBox").val("1");
+            //    } else {
+            //        $("#HMixedBox").val("");
+            //    }
+
+            //});
 
 
             //瀛愪欢鏉＄爜鍥炶溅鏂规硶
@@ -585,6 +607,88 @@
                         layer.alert("瀛愪欢鏉＄爜鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
                         return;
                     }
+                    //鍒ゆ柇鎵规鏄惁瓒呰繃3涓�
+                    if (zxQty == zxQtyFlag) {
+                        playSound();
+                        layer.alert("瑁呯鏁伴噺宸叉壂瀹岋紝璇风偣鍑讳繚瀛橈紒", { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        $("#HRemark").attr("readonly", "readonly");//涓嶆弧绠辨爣璇嗗彧璇�
+                        $("#HRemark").css("background-color", "#efefef4d");
+                        return;
+                    }
+                    // 鐩存帴浣跨敤鍥哄畾浣嶇疆鎴彇鎵规淇℃伅
+                    var batchInfo = '';
+                    var SubBarcode = $('#SubBarcode').val();
+
+                    // 鐩存帴浠庣16-23涓瓧绗︽埅鍙栨壒娆′俊鎭紙绱㈠紩浠�0寮�濮嬶級
+                    // 绗�16涓瓧绗︾储寮曟槸16锛岀23涓瓧绗︾储寮曟槸23锛岄渶瑕佹埅鍙�8涓瓧绗�
+                    if (SubBarcode.length >= 24) { // 纭繚鏉＄爜闀垮害瓒冲
+                        batchInfo = SubBarcode.substring(18, 26); // 鐩存帴鎴彇鍥哄畾浣嶇疆
+                        console.log("鎵规淇℃伅(18, 26):", batchInfo);
+                    } else {
+                        playSound();
+                        layer.alert("鏉＄爜闀垮害涓嶈冻24浣嶏紝鏃犳硶鎻愬彇鎵规淇℃伅", {
+                            icon: 5,
+                            btn: ['閫�鍑�'],
+                            time: 100000,
+                            offset: 't'
+                        });
+                        return;
+                    }
+
+                    // 鎵规妫�鏌ラ�昏緫
+                    if (batchInfo && batchInfo.length === 8) {
+                        // 妫�鏌ユ槸鍚︽贩绠�
+                        if ($("#HMixedBox").val() == "") { // 涓嶆贩绠�
+                            if (batch1 === '') {
+                                // 绗竴涓壒娆�
+                                batch1 = batchInfo;
+                                currentBatchCount = 1;
+                            } else {
+                                // 妫�鏌ユ壒娆℃槸鍚︿竴鑷�
+                                if (batchInfo !== batch1) {
+                                    playSound();
+                                    layer.alert("涓嶅厑璁告贩绠憋紒褰撳墠鎵规涓猴細" + batch1 + "锛屾壂鎻忕殑鎵规涓猴細" + batchInfo, {
+                                        icon: 5,
+                                        btn: ['閫�鍑�'],
+                                        time: 100000,
+                                        offset: 't'
+                                    });
+                                    return;
+                                }
+                            }
+                        }
+                        else { // 鍏佽娣风
+                            if (batch1 === '') {
+                                // 绗竴涓壒娆�
+                                batch1 = batchInfo;
+                                currentBatchCount = 1;
+                            } else if (batch2 === '' && batchInfo !== batch1) {
+                                // 绗簩涓笉鍚屾壒娆�
+                                batch2 = batchInfo;
+                                currentBatchCount = 2;
+                            } else if (batchInfo !== batch1 && batchInfo !== batch2) {
+                                // 绗笁涓笉鍚屾壒娆�
+                                playSound();
+                                layer.alert("宸插瓨鍦ㄤ袱涓笉鍚岀殑鎵规锛屼笉鍏佽绗笁涓壒娆★紒\n鎵规1: " + batch1 + "\n鎵规2: " + (batch2 || "鏃�") + "\n褰撳墠鎵规: " + batchInfo, {
+                                    icon: 5,
+                                    btn: ['閫�鍑�'],
+                                    time: 100000,
+                                    offset: 't'
+                                });
+                                return;
+                            }
+                        }
+                    } else {
+                        // 鎵规淇℃伅鏃犳晥
+                        playSound();
+                        layer.alert("鎵规淇℃伅鏍煎紡涓嶆纭紝搴斾负8涓瓧绗�", {
+                            icon: 5,
+                            btn: ['閫�鍑�'],
+                            time: 100000,
+                            offset: 't'
+                        });
+                        return;
+                    }
                     //var a = 0;
 
                     //$.ajax({//鍒ゆ柇鏉＄爜鐨勭姸鎬�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
new file mode 100644
index 0000000..9cff162
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_BlueToothBarCodePrint.html"
@@ -0,0 +1,424 @@
+锘�<!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/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/grwebapp.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>钃濈墮鏍囩鐢熸垚</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
+                                                <label class="layui-form-label" style="padding-left:0px" id="">钃濈墮鐮�:</label>
+                                                <input type="text" class="layui-input" name="HBarCode" lay-verify="HBarCode" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode" style="width: 500px;">
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">妯℃澘鍚嶇О</label>
+                                                <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                    <select name="HPrintTemplate" id="HPrintTemplate" class="ForFilteringSchemes" lay-filter="HPrintTemplate"
+                                                            lay-verify="HPrintTemplate">
+                                                        <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡浠ｇ爜*</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterModel" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎿嶄綔鍛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+                            <ul class="layui-tab-title">
+                                <li lay-id="1" class="layui-this">鏉＄爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>                               
+                            </div>
+                        </div>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>                        
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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 option = [];
+       
+            //#endregion 
+
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //#endregion                     
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+
+            form.on('select(HPrintTemplate)', function (data) {
+                // 2. 鑾峰彇閫変腑鐨勫��
+                const selectedValue = data.value;
+
+                // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+                localStorage.setItem('BlueToothselectedTemplate', selectedValue);
+
+                // 濡傛灉闇�瑕佷細璇濈骇瀛樺偍锛堟祻瑙堝櫒鍏抽棴鍚庢竻闄わ級锛屾敼鐢� sessionStorage锛�
+                // sessionStorage.setItem('selectedTemplate', selectedValue);
+
+                console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+            });
+
+            //#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
+
+            //鍏抽敭浠跺洖杞︽柟娉�
+            $('#HBarCode').on('keydown', function (event) {
+                var HBarCode = $('#HBarCode').val();
+                if (event.keyCode == 13) {
+                    
+                    if (HBarCode) {
+                        SaveBarCodeCreate(HBarCode);
+                    }
+
+                }
+            });
+
+            //閫夋嫨浜у搧浠ｇ爜鎸夐挳
+            form.on('submit(btnSearchMater)', function () {
+                get_checkSearchMater();
+            });
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+          
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+            function set_InitGrid() {
+                getTem();//鑾峰彇鎵撳嵃妯℃澘
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HBarCodeID', title: '鏉＄爜ID', hide: true }
+                    , { field: 'HBarCode', title: '鏉＄爜缂栧彿' }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜'}
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О'}
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , page: false
+                    , totalRow: true
+                    , cellMinWidth: 75
+                    , height: 'full-255'
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+                option.data=[[]]
+                table.render(option);              
+            }
+            //#region 鑾峰彇鎵撳嵃妯℃澘
+            function getTem() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    async: false,
+                    url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                    data: { "HNumber": "HGy_BarCodeBill" },
+                    success: function (result) {
+                        var template = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                template += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                            }
+                            $("#HPrintTemplate").append(template);
+                            $("#HPrintTemplate").val(localStorage.getItem('BlueToothselectedTemplate'))
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+            //#endregion
+              
+
+            //鏉＄爜鐢熸垚
+            function SaveBarCodeCreate(HBarCode) {
+
+                var HMaterID = $("#HMaterID").val();
+                var HOrgID = sessionStorage["OrganizationID"];
+                var user = sessionStorage["HUserName"];
+                var wait = layer.load();
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_SingleStation/BlueToothBarCodeSave", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HBarCode": HBarCode, "HMaterID": HMaterID, "HOrgID": HOrgID, "user": user },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                //琛ㄦ牸璧嬪��
+                                option.data.push({
+                                    "HBarCodeID": 0, "HBarCode": HBarCode, "HMaterNumber": $("#HMaterNumber").val(), "HMaterName": $("#HMaterName").val(), "HMaterModel": $("#HMaterModel").val()
+                                });;
+                                table.render(option);
+
+                                //鑷姩鎵撳嵃
+                                dy_PL(HBarCode);
+                                
+                                $('#HBarCode').val("");
+                            }
+                            else {
+                                layer.close(wait);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.close(wait);
+                        },
+                        error: function (err) {
+                            layer.close(wait);
+                            layer.alert(err.responseText, { icon: 5 });
+                        }
+                    });
+            }
+
+            //鎵归噺鎵撳嵃
+            function dy_PL(HBarCode) {
+                var sWhere = "select Top 1 * from h_v_IF_BarCodeBillList with(nolock) where 鏉＄爜缂栧彿 = '" + HBarCode+"'"
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                
+
+                                var Customer = {
+                                    "Table": data.data
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val() + ".grf"),
+                                    data: Customer
+                                };
+
+                                console.log(data.data[0].鏉＄爜缂栧彿);
+                                //var args = {
+                                //    report: urlAddRandomNo("../../grf/cs10.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 });
+                    }
+                })
+
+            }
+
+            //浜у搧閫夋嫨椤甸潰
+            function get_checkSearchMater() {
+                var HOrgID = sessionStorage["OrganizationID"];
+
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐗╂枡琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        //鑾峰彇鏁版嵁
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);//鐗╂枡id
+                        $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+                        $("#HMaterNumber").val(checkStatus.data[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+        });
+
+        function GetMaterValue(obj) {
+            //鑾峰彇鏁版嵁
+            $("#HMaterID").val(obj[0].HItemID);//鐗╂枡id
+            $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+            $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+            $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+            if ($("#HName").val() == "") {
+                $("#HName").val(obj[0].鐗╂枡浠ｇ爜);
+            }
+        }
+    </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/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
index 87ec336..0f2108a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement.html"
@@ -91,7 +91,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
                                                 <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                 <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                             </div>
@@ -614,7 +614,7 @@
             var HBillNo = $("#HBillNo").val();
             $.ajax({
                 type: "GET",
-                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBind_XW",
                 async: false,
                 data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                 dataType: "json",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
new file mode 100644
index 0000000..1db25ea
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_KeyElement_Sec.html"
@@ -0,0 +1,1182 @@
+锘�<!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/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="../../CreateControl.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>棣欏泭鍏抽敭浠剁粦瀹氳繃绔欏钩鍙�</b></h1>
+                    </div>
+                    <div class="layui-tab" style="width: 100%; float: left; background-color:white;">
+                        <div class="layui-row">
+                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
+                                <label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
+                                <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
+                            </div>
+                            
+
+                            <button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
+
+
+
+                        </div>
+
+
+                    </div>
+                    <div class="layui-tab layui-tab-card" style="width: 49%; float: left; background-color: white;height:400px">
+                        <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" style="">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                    <div class="layui-row">
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">鎵规鐮佷俊鎭�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBarCode_BatchSec" lay-verify="HBarCode_BatchSec" id="HBarCode_BatchSec" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">褰撳墠鎵规:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBatchNo" lay-verify="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>-->
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">渚涘簲鍟�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HSupID" name="HSupID" id="HSupID">
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">褰撳墠闀洉鐮�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HSNNo" lay-verify="HSNNo" id="HSNNo" 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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color: #efefef4d; width: 60%; display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
+                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HICMOBillNo">鐢熶骇璁㈠崟</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
+                                                <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
+                                                <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HProcName">宸ュ簭</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterNumber">浜у搧缂栫爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterName">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterModel">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HDeptName">褰撳墠杞﹂棿</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" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+                                                <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>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HEmpName">鎿嶄綔鍛�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HGroupName">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HSourceName">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                    </div>
+                                    <div class="layui-row">
+
+                                    </div>
+                                    <div class="layui-row">
+
+
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-tab layui-tab-card" style="width: 50.5%; float: right;">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍏抽敭浠舵竻鍗�</li>
+                        </ul>
+                        <div class="layui-tab-content" style="background-color: white;">
+                            <div class="layui-input-block" style="display: inline-block; margin-left:0px;">
+                                <label class="layui-form-label" style="padding-left:0px" id="">鍏抽敭浠剁爜:</label>
+                                <input type="text" class="layui-input" name="HBarCode_Key" lay-verify="HBarCode_Key" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_Key" style="width: 500px;float:left">
+
+                            </div>
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-tab-card" style="float:left;width:100%">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍘嗗彶杩囩珯娓呭崟</li>
+                        </ul>
+                        <label class="layui-form-label" style="color: red; font-size: 24px; width:auto;position:absolute;left:300px;margin-top:-40px" id="HReturnMessage">鎴愬姛鎵爜:</label>
+                        <div class="layui-tab-content" style="background-color: white;">
+
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></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>
+                        </div>
+                    </script>-->
+                    <script type="text/html" id="toolbarDemo2">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙ｆā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
+
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , tableSelect = layui.tableSelect;
+
+        //瀹氫箟鍏ㄥ眬鍙橀噺
+
+        var HModName = "Cj_ProcessItemStationPlatform_KeyElement";
+        var HModName2 = "Cj_ProcessItemStationPlatform_KeyElement2";
+        var option = [];
+        var option2 = [];
+        var rowarr = [];//鍏抽敭浠舵竻鍗�
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+        var params = get_UrlVars();
+        set_ClearBill();
+
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鍒犻櫎鎸夐挳
+                case 'btn-Delete': set_DeleteBill();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
+                    break;
+            };
+        });
+        table.on('toolbar(mainTable2)', function (obj) {
+            switch (obj.event) {
+                //鍒犻櫎鎸夐挳
+                case 'btn-Delete2': btn_Delete();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
+                    break;
+                //鍒锋柊
+                case 'refresh': get_Display();
+                    break;
+            };
+        });
+        //闀洉鐮佸洖杞︽柟娉�
+        $('#HBarCode_SN').on('keydown', function (event) {
+            var HBarCode_SN = $('#HBarCode_SN').val();
+            if (event.keyCode == 13) {
+                if ($('#HProcExchBillNo').val() == "") {
+                    $('#HBarCode_SN').val("");
+                    return layer.alert("璇峰厛閫夋嫨娴佽浆鍗�")
+                }
+
+
+                if (HBarCode_SN) {
+                    txtHBarCodeSN_KeyDown(HBarCode_SN);
+                }
+
+            }
+        });
+        //鍏抽敭浠跺洖杞︽柟娉�
+        $('#HBarCode_Key').on('keydown', function (event) {
+            var HBarCode_Key = $('#HBarCode_Key').val();
+            if (event.keyCode == 13) {
+                
+                if (HBarCode_Key) {
+                    txtHBarCodeKey_KeyDown(HBarCode_Key);
+                }
+
+            }
+        });
+
+        //閫夋嫨鎿嶄綔鍛�
+        form.on('submit(btnHEmp)', function () {
+            btnHEmp();
+        });
+
+
+        //閫夋嫨鐢熶骇璧勬簮
+        form.on('submit(btnHSource)', function () {
+            btnHSource();
+        });
+
+        //閫夋嫨鐢熶骇鐝粍鎸夐挳
+        form.on('submit(btnHGroup)', function () {
+            btnHGroup();
+        });
+
+        //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+        form.on('submit(btnHDept)', function () {
+            btnHDept();
+        });
+
+        //閫夋嫨宸ュ簭鎸夐挳
+        form.on('submit(btnHProc)', function () {
+            btnHProc();
+        });
+
+        //閫夋嫨娴佽浆鍗℃寜閽�
+        form.on('submit(btnHProcExch)', function () {
+            btnHProcExch();
+        });
+
+
+        //閫�鍑�
+        form.on('submit(btnExit)', function (data) {
+            if (params[1] != null) {
+                Pub_Close(1);
+            } else if (params[1] == null) {
+                Pub_Close(2);
+            }
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
+            $("#HBarCode_Key").focus();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+            //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+            GetDefValByUser();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //
+            get_Display();
+        }
+
+        //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+        function GetDefValByUser() {
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+                type: "GET",
+                async: false,
+                data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+                success: function (result) {
+                    var data = result.data[0];
+
+                    form.val("formData", {
+                        "HSourceID": data.HSourceID,
+                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+                        "HGroupID": data.HGroupID,
+                        "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+                        "HEmpID": data.HEmpID,
+                        "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+                        "HDeptID": data.HDeptID,
+                        "HDeptName": data.閮ㄩ棬鍚嶇О,
+                        "HProcNumber": data.宸ュ簭浠ｇ爜,
+                        "HProcName": data.宸ュ簭鍚嶇О,
+                        "HProcID": data.HProcID
+                    });
+                    layer.close(index);
+                }
+                , error: function () {
+                    layer.close(index);
+                    layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                }
+            })
+        }
+            //#endregion
+
+        //鍏抽敭浠舵竻鍗�
+        function set_InitGrid() {
+            option= {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , page: false
+                , totalRow: true
+                , cellMinWidth: 120
+                , data: []
+                , height: 285
+                , limit: 10
+                , cols: [[ //缁戝畾淇℃伅琛�
+                    { type: 'numbers', title: '搴忓彿', width: 50 }
+                    , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+                    , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+                    , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+                    , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+                    , { field: 'HBatchNo', title: '鎵规', width: 160, hide: true }
+                    , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+                    , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+                    , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+                    , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+                    , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+                    , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
+                ]]
+            }
+            option2 = {
+                elem: '#mainTable2'
+                , toolbar: '#toolbarDemo2'
+                , page: false
+                , totalRow: true
+                , cellMinWidth: 120
+                , data: []
+                , height: 385
+                , limit: 10
+                , cols: [[
+                    { type: 'numbers', title: '搴忓彿' }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
+                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
+                    , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
+                    , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true }
+                    , { field: 'HBatchNo', title: '褰撳墠鎵规' }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
+                    , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
+                    , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
+                    , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HBarCode', title: 'HBarCode', hide: true }
+                ]]
+            }
+
+                // 鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗�
+            tableSelect.render({
+                elem: '#HProcExchBillNo',
+                checkedKey: 'hmainid',
+                searchKey: '鍗曟嵁鍙�',
+                sWhere: '',//table鎼滅储sWhere鏉′欢
+                table: {
+                    url: GetWEBURL() + 'LEMS/Sc_ProcessExchangeBillList_Query_byPage',
+                    where: { user: sessionStorage["HMaker"], "Organization": sessionStorage["Organization"],"HBillSubType":3772 },
+                    cols: [[
+                        { type: 'checkbox', fixed: 'left' },
+                        { field: 'hmainid', title: 'hmainid', hide: true },
+                        { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' },
+                        { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' },
+                        { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' },
+                        { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸' },
+                        { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' },
+                        { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    ]],
+                    page: true,
+                    limit: 5,
+                    limits: [5]
+                },
+                done: function (elem, data) {
+                    if (data != []) {
+                        //鑾峰彇鏁版嵁
+                        createBillNo();
+                        txtHProcExch_KeyDown(data.data[0].鍗曟嵁鍙�);
+                        $("#HProcExchBillNo").val(data.data[0].鍗曟嵁鍙�);
+                        $("#HProcExchInterID").val(data.data[0].hmainid);
+                        $("#HMaterNumber").val(data.data[0].浜у搧浠ｇ爜)
+                        $("#HMaterName").val(data.data[0].浜у搧鍚嶇О)
+                        $("#HMaterModel").val(data.data[0].浜у搧瑙勬牸)
+                        $("#HICMOBillNo").val(data.data[0].浠诲姟鍗曞彿)
+                        $("#HICMOEntryID").val(data.data[0].HICMOEntryID)
+
+                        $("#HBarCode_Key").focus();
+                    }
+
+                }
+            })
+
+            table.render(option);
+            table.render(option2);
+        }
+        
+        //浜у搧SN闀洉鐮佺爜鍥炶溅鏌ヨ
+        function txtHBarCodeSN_KeyDown(HBarCode) {
+            if (checkHProcExchAndHBarCodeSN(HBarCode)) {
+                //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+                if (areQuantitiesEqual(option.data)) {
+                    //淇濆瓨鍏抽敭浠�
+                    if (AllowLoadData()) {
+                        set_SaveBill();
+                    }
+                }
+            } else {
+                return layer.alert("娴佽浆鍗″拰闀洉鐮佷笉涓�鑷达紝璇锋鏌�")
+            }
+
+        }
+
+        //浜у搧娴佽浆鍗¤繑鍥濨om
+        function txtHProcExch_KeyDown(HBarCode) {
+            //涓昏〃淇℃伅鏌ヨ
+            var indexs = layer.load();
+            //閰嶄欢淇℃伅鏌ヨ
+            var HBillNo = $("#HBillNo").val();
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomListByHProcExch_XW",
+                async: false,
+                data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data
+
+                        rowarr = [];
+                        for (var i = 0; i < data.length; i++) {
+                            rowarr.push({
+                                "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+                                , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": data[i].瀛愰」鐗╂枡浠ｇ爜, "HMaterName": data[i].瀛愰」鐗╂枡鍚嶇О, "HMaterModel": data[i].瀛愰」瑙勬牸鍨嬪彿, "HBatchNo": ""
+                                , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+                                , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+                                , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+                            });
+                        }
+
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+
+                        table.render(option);
+                        layer.close(indexs);
+                        //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+                        $("#HBarCode_Key").focus();
+                        
+                    }
+                    else {
+                        layer.close(indexs);
+                        layer.confirm(data1.Message);
+                    }
+                },
+                error: function (err) {
+                    layer.close(indexs);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+
+        }
+
+        //閰嶄欢鐮佸洖杞︽煡璇�
+        function txtHBarCodeKey_KeyDown(HBarCode) {
+            var indexs = layer.load();
+            var HBillNo = $("#HBillNo").val();
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBindByHProcExch_XW",
+                async: false,
+                data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HProcExchBillNo').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data
+
+                        for (var i = 0; i < option.data.length; i++) {
+                            if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+                                option.data[i].HMaterID = data[0].HMaterID
+                                option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+                                option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+                                option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+                                option.data[i].HBarCode = data[0].閰嶄欢鐮�
+                                option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+                                $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓厤浠�:" + data[0].鐗╂枡鍚嶇О);
+                                break;
+                            } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+                                layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+                            } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+                                layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+                            }
+                        }
+
+                        //option.data = rowarr;
+
+                        table.render(option);
+                        //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+                        $("#HBarCode_Key").focus();
+                        $("#HBarCode_Key").val("");
+                        //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+                        if (areQuantitiesEqual(option.data)) {
+                            //淇濆瓨鍏抽敭浠�
+                            $("#HBarCode_SN").val("");
+                            $("#HBarCode_SN").focus();
+                        }
+                        layer.close(indexs);
+                    }
+                    else {
+                        layer.close(indexs);
+                        layer.confirm(data1.Message);
+                    }
+                },
+                error: function (err) {
+                    layer.close(indexs);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //鏍￠獙闀洉鐮佸拰娴佽浆鍗′俊鎭槸鍚︿竴鑷�
+        function checkHProcExchAndHBarCodeSN(HBarCode) {
+            let result = false
+            //鑾峰彇瀵瑰簲涓昏〃淇℃伅
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
+                async: false,
+                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        if (data1.data[0]["HSourceEntryID"] == $("#HICMOEntryID").val() && data1.data[0]["HSourceBillNo"] == $("#HICMOBillNo").val()) {
+                            result = true;
+                        }
+                    }
+                },
+                error: function (err) {
+                    
+                }
+            });
+            return result;
+        }
+
+
+
+        //鍔犺浇鍘嗗彶杩囩珯娓呭崟淇℃伅
+        function get_Display(sWhere = '') {
+            var ajaxLoad = layer.load();
+            var HProcID = $("#HProcID").val();
+            var HSourceID = $("#HSourceID").val();
+            sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+            $.ajax({
+                url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
+                async: false,
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = [];//鍒楀瓧娈垫暟鎹�
+                        var col = [];
+                        var titleData = []
+                        var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                            } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                        return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                    }, style: 'cursor: pointer;'
+                                });
+                            } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+                                        return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+                                    }, style: 'cursor: pointer;'
+                                });
+                            } else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                }
+                            }
+                        }
+                        option2.cols = [col]
+                        option2.data = data1.data;
+
+
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
+
+                        table.render(option2);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#region 淇濆瓨鏂规硶
+        function set_SaveBill() {
+            var data = {
+                "field": {
+                    "HProcID": $("#HProcID").val(), "HBatchNo": "",
+                    "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
+                    "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+                }
+            };
+            var sMainStr = JSON.stringify(data.field);
+            var HBarCode = $("#HBarCode_SN").val();
+            var sSubStr = JSON.stringify(option.data);
+            var sMainSub = sMainStr + ';' + HBarCode + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+            var indexs = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillAndAssemblyBill",
+                async: false,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(indexs);
+
+
+                        $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
+                        //鍒囨崲浜у搧
+                        $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
+                        $("#HBarCode_Key").focus();//鍏抽敭浠舵枃鏈閫変腑
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+                        table.render(option);
+                        get_Display();
+                    }
+                    else {
+
+                        layer.close(indexs);
+                        layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+                    }
+
+                },
+                error: function (err) {
+
+                    layer.close(indexs);
+                    layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                }
+            });
+        }
+        //#endregion
+
+        //鍒犻櫎鍗曟嵁
+        function btn_Delete() {
+            var checkStatus = table.checkStatus('mainTable2')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+                    var ajaxLoad = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBillandAssemblyBill',
+                        type: "GET",
+                        data: { "HInterID": data[0].hmainid, "HBarCode_P": data[0].闀洉SN鐮�, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                get_Display();
+                                layer.close(ajaxLoad);
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    });
+                    layer.close(index);
+                });
+            } else {
+                layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+            }
+        }
+
+        // 鐢熸垚鍗曟嵁鍙�
+        function createBillNo() {
+            //閲嶆柊鑾峰彇鍗曟嵁鍙�
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNumPDA",
+                type: "GET",
+                async: false,
+                data: { "HBillType": '3727' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    //$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));  //榛樿涓哄綋鍓嶆棩鏈�
+                    //閲嶆柊鍚敤淇濆瓨鎸夐挳
+                    //$("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+                }
+            });
+        }
+
+        //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+                    var wait = layer.load();
+                    //鍒犻櫎涓存椂琛ㄦ暟鎹�
+                    $.ajax({
+                        url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+                        type: "GET",
+                        data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1, time: 500 }, function () {
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(wait);
+                                });
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+
+
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    option.data[rowIndex].HBarCode = "";
+                    option.data[rowIndex].HBindingQty = 0;
+                    //option.data[rowIndex].HMaterID = 0;
+                    option.data[rowIndex].HMaterNumber = "";
+                    option.data[rowIndex].HMaterName = "";
+                    option.data[rowIndex].HMaterModel = "";
+                    option.data[rowIndex].HBarCode = "";
+
+                    table.render(option);
+                    layer.close(index);
+                });
+            }
+        }
+
+        //鍛樺伐閫夋嫨椤甸潰
+        function btnHEmp() {
+            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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HEmpID").val(checkStatus.data[0].HItemID);
+                    $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+            })
+        }
+
+
+        //鐢熶骇璧勬簮閫夋嫨椤甸潰
+        function btnHSource() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSourceID").val(checkStatus.data[0].HItemID);
+                    $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鐢熶骇鐝粍閫夋嫨椤甸潰
+        function btnHGroup() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐝粍琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+                    $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鐢熶骇杞﹂棿閫夋嫨椤甸潰
+        function btnHDept() {
+            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 != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HDeptID").val(checkStatus.data[0].HItemID);//
+                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //宸ュ簭閫夋嫨椤甸潰
+        function btnHProc() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '宸ュ簭鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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 != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HProcID").val(checkStatus.data[0].HItemID);//
+                    $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+                    $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        function btnHProcExch() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '娴佽浆鍗″垪琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    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('璇烽�夋嫨鏁版嵁');
+                    }
+                    
+
+                    createBillNo();
+                    txtHProcExch_KeyDown(checkStatus.data[0].鍗曟嵁鍙�);
+                    $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                    $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+                    $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜)
+                    $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О)
+                    $("#HMaterModel").val(checkStatus.data[0].浜у搧瑙勬牸)
+                    $("#HICMOBillNo").val(checkStatus.data[0].浠诲姟鍗曞彿)
+                    $("#HICMOEntryID").val(checkStatus.data[0].HICMOEntryID)
+
+                    $("#HBarCode_Key").focus();
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData() {
+
+            var HBarCode = $("#HBarCode_SN").val();
+            if (HBarCode == "") {
+                layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
+                return false;
+            }
+            var sSubStr = JSON.stringify(table.cache['mainTable']);
+
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+                        layer.msg("缁戝畾淇℃伅绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
+            } else {
+                layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+
+
+            //var HBadReasonID = $("#HBadReasonID").val();
+            //if (HBadReasonID == 0) {
+            //    layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+            //    return false;
+            //}
+            return true;
+        }
+        //鍒ゆ柇鏄惁缁戝畾瀹�
+        function areQuantitiesEqual(arr) {
+            if (arr.length === 0) {
+                return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+            }
+
+            const firstHPartsQty = arr[0].HPartsQty;
+            const firstHBindingQty = arr[0].HBindingQty;
+
+            for (let i = 1; i < arr.length; i++) {
+                if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        //#endregion
+
+    });
+    function GetHEmpValue(obj)  //杩斿洖鑱屽憳
+    {
+        $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+        $("#HEmpID").val(obj[0].HItemID);
+        
+    }
+    function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+    {
+        $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+        $("#HDeptID").val(obj[0].HItemID);
+    }
+    function GetHGroupValue(obj)  //杩斿洖鐝粍
+    {
+        $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+        $("#GroupID").val(obj[0].HItemID);
+    }
+    function GetProcessValue(obj)  //杩斿洖宸ュ簭
+    {
+        $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+        $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//
+        $("#HProcID").val(obj[0].HItemID);
+    }
+    function GetGySource(obj)  //杩斿洖鐢熶骇璧勬簮
+    {
+        $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+        $("#HSourceID").val(obj[0].HItemID);
+    }
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
index 3bd6d03..e2ad4b3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_batchKeyElement.html"
@@ -740,7 +740,7 @@
             var HBillNo = $("#HBillNo").val();
             $.ajax({
                 type: "GET",
-                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBind_XW",
                 async: false,
                 data: { "HBillNo": HBillNo,"HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                 dataType: "json",
@@ -821,7 +821,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": $("#HBarCode_Batch").val(),
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage.html"
index 8190f4b..4d7701e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage.html"
@@ -614,7 +614,7 @@
             var HBillNo = $("#HBillNo").val();
             $.ajax({
                 type: "GET",
-                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomMatch_XW",
+                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBind_XW",
                 async: false,
                 data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HBarCode_SN').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
                 dataType: "json",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
new file mode 100644
index 0000000..c13cdd8
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkPackage_Sec.html"
@@ -0,0 +1,1180 @@
+锘�<!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/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="../../CreateControl.js"></script>
+    <script src="../../../layuiadmin/MESLanguage.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+                    <div style="padding: 10px;">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鍖呰鏍￠獙缁戝畾杩囩珯骞冲彴</b></h1>
+                    </div>
+                    <div class="layui-tab" style="width: 100%; float: left; background-color:white;">
+                        <div class="layui-row">
+                            <div class="layui-input-block" style="display: inline-block; margin-left: 0px; float: left">
+                                <label class="layui-form-label" style="padding-left:0px" id="">闀洉鐮�:</label>
+                                <input type="text" class="layui-input" name="HBarCode_SN" lay-verify="HBarCode_SN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_SN" style="width: 500px;">
+                            </div>
+                            
+
+                            <button class="layui-btn layui-btn-normal" style="float:right" type="button" lay-submit="" lay-filter="btnExit" id="btnExit">閫�鍑�</button>
+
+
+
+                        </div>
+
+
+                    </div>
+                    <div class="layui-tab layui-tab-card" style="width: 49%; float: left; background-color: white;height:400px">
+                        <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" style="">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+
+                                    <div class="layui-row">
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">鎵规鐮佷俊鎭�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBarCode_BatchSec" lay-verify="HBarCode_BatchSec" id="HBarCode_BatchSec" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">褰撳墠鎵规:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HBatchNo" lay-verify="HBatchNo" id="HBatchNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>-->
+                                        <!--<div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">渚涘簲鍟�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HSupID" name="HSupID" id="HSupID">
+                                            </div>
+                                        </div>-->
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="">褰撳墠闀洉鐮�:</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HSNNo" lay-verify="HSNNo" id="HSNNo" 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="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#EDEDED;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color: #efefef4d; width: 60%; display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
+                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProcExch" id="btnHProcExch" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HICMOBillNo">鐢熶骇璁㈠崟</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" lay-verify="HICMOBillNo" id="HICMOBillNo" value="" style="background-color:#efefef4d;">
+                                                <input type="hidden" class="layui-input" name="HICMOInterID" lay-verify="HICMOInterID" id="HICMOInterID" value="0">
+                                                <input type="hidden" class="layui-input" name="HICMOEntryID" lay-verify="HICMOEntryID" id="HICMOEntryID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HProcName">宸ュ簭</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 60%; display: inline-block;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterNumber">浜у搧缂栫爜</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterName">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;" id="BT_HMaterModel">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" lay-verify="HMaterModel" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-row">
+
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HDeptName">褰撳墠杞﹂棿</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" class="layui-input" lay-verify="HDeptID" name="HDeptID" id="HDeptID">
+                                                <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>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;" id="BT_HEmpName">鎿嶄綔鍛�</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" lay-verify="HEmpName" name="HEmpName" id="HEmpName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" lay-verify="HEmpID" name="HEmpID" id="HEmpID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp" id="btnHEmp" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HGroupName">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" lay-verify="HGroupName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HGroupID" lay-verify="HGroupID" id="HGroupID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroup" id="btnHGroup" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px; padding: 9px 18px;" id="BT_HSourceName">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-block" style="margin-left: 77px;">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" lay-verify="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                <input type="hidden" class="layui-input" name="HSourceID" lay-verify="HSourceID" id="HSourceID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                    </div>
+                                    <div class="layui-row">
+
+                                    </div>
+                                    <div class="layui-row">
+
+
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 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="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="layui-tab layui-tab-card" style="width: 50.5%; float: right;">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍏抽敭浠舵竻鍗�</li>
+                        </ul>
+                        <div class="layui-tab-content" style="background-color: white;">
+                            <div class="layui-input-block" style="display: inline-block; margin-left:0px;">
+                                <label class="layui-form-label" style="padding-left:0px" id="">鍏抽敭浠剁爜:</label>
+                                <input type="text" class="layui-input" name="HBarCode_Key" lay-verify="HBarCode_Key" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCode_Key" style="width: 500px;float:left">
+
+                            </div>
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-tab layui-tab-card" style="float:left;width:100%">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鍘嗗彶杩囩珯娓呭崟</li>
+                        </ul>
+                        <label class="layui-form-label" style="color: red; font-size: 24px; width:auto;position:absolute;left:300px;margin-top:-40px" id="HReturnMessage">鎴愬姛鎵爜:</label>
+                        <div class="layui-tab-content" style="background-color: white;">
+
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable2" lay-filter="mainTable2"></table>
+                            </div>
+                        </div>
+                    </div>
+                    <!--<script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></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>
+                        </div>
+                    </script>-->
+                    <script type="text/html" id="toolbarDemo2">
+                        <div class="layui-btn-container">
+                            <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete2"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>-->
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="refresh" id="refresh"><i class="layui-icon layui-icon-form"></i>鍒锋柊</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn2" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                        </div>
+                    </script>
+                </form>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<script>
+
+    layui.config({
+        base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+    }).extend({
+        index: 'lib/index' //涓诲叆鍙ｆā鍧�
+    }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
+
+        //#region 鍏叡鍙橀噺
+
+        var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , tableSelect = layui.tableSelect;
+
+        //瀹氫箟鍏ㄥ眬鍙橀噺
+
+        var HModName = "Cj_ProcessItemStationPlatform_KeyElement";
+        var HModName2 = "Cj_ProcessItemStationPlatform_KeyElement2";
+        var option = [];
+        var option2 = [];
+        var rowarr = [];//鍏抽敭浠舵竻鍗�
+        //#endregion
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+        var params = get_UrlVars();
+        set_ClearBill();
+
+
+
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+        table.on('tool(mainTable)', function (obj) {
+            set_GridDelete(obj);   //琛屽唴鍒犻櫎
+        });
+
+        //澶村伐鍏锋爮浜嬩欢
+        table.on('toolbar(mainTable)', function (obj) {
+            switch (obj.event) {
+                //鍒犻櫎鎸夐挳
+                case 'btn-Delete': set_DeleteBill();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_Display);
+                    break;
+            };
+        });
+        table.on('toolbar(mainTable2)', function (obj) {
+            switch (obj.event) {
+                //鍒犻櫎鎸夐挳
+                case 'btn-Delete2': btn_Delete();
+                    break;
+                //鍒楄缃�
+                case 'set_HideColumn2': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option2, get_Display);
+                    break;
+                //鍒锋柊
+                case 'refresh': get_Display();
+                    break;
+            };
+        });
+        //闀洉鐮佸洖杞︽柟娉�
+        $('#HBarCode_SN').on('keydown', function (event) {
+            var HBarCode_SN = $('#HBarCode_SN').val();
+            if (event.keyCode == 13) {
+                if ($('#HProcExchBillNo').val() == "") {
+                    $('#HBarCode_SN').val("");
+                    return layer.alert("璇峰厛閫夋嫨娴佽浆鍗�")
+                }
+
+
+                if (HBarCode_SN) {
+                    txtHBarCodeSN_KeyDown(HBarCode_SN);
+                }
+
+            }
+        });
+        //鍏抽敭浠跺洖杞︽柟娉�
+        $('#HBarCode_Key').on('keydown', function (event) {
+            var HBarCode_Key = $('#HBarCode_Key').val();
+            if (event.keyCode == 13) {
+                
+                if (HBarCode_Key) {
+                    txtHBarCodeKey_KeyDown(HBarCode_Key);
+                }
+
+            }
+        });
+
+        //閫夋嫨鎿嶄綔鍛�
+        form.on('submit(btnHEmp)', function () {
+            btnHEmp();
+        });
+
+
+        //閫夋嫨鐢熶骇璧勬簮
+        form.on('submit(btnHSource)', function () {
+            btnHSource();
+        });
+
+        //閫夋嫨鐢熶骇鐝粍鎸夐挳
+        form.on('submit(btnHGroup)', function () {
+            btnHGroup();
+        });
+
+        //閫夋嫨鐢熶骇杞﹂棿鎸夐挳
+        form.on('submit(btnHDept)', function () {
+            btnHDept();
+        });
+
+        //閫夋嫨宸ュ簭鎸夐挳
+        form.on('submit(btnHProc)', function () {
+            btnHProc();
+        });
+
+        //閫夋嫨娴佽浆鍗℃寜閽�
+        form.on('submit(btnHProcExch)', function () {
+            btnHProcExch();
+        });
+
+
+        //閫�鍑�
+        form.on('submit(btnExit)', function (data) {
+            if (params[1] != null) {
+                Pub_Close(1);
+            } else if (params[1] == null) {
+                Pub_Close(2);
+            }
+        });
+
+
+        //#endregion
+
+        //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+        //鍒濆鍖栫晫闈�
+        function set_ClearBill() {
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
+            $("#HBarCode_Key").focus();
+            //鍒跺崟浜�
+            $("#HMaker").val(sessionStorage["HUserName"]);
+            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+            //閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+            GetDefValByUser();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //
+            get_Display();
+        }
+
+        //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
+        function GetDefValByUser() {
+            var index = layer.load();
+            $.ajax({
+                url: GetWEBURL() + "/Cj_StationInBill/GetDefValByUser",
+                type: "GET",
+                async: false,
+                data: { "Czybm": sessionStorage["Czybm"], "Czymc": sessionStorage["HUserName"] },
+                success: function (result) {
+                    var data = result.data[0];
+
+                    form.val("formData", {
+                        "HSourceID": data.HSourceID,
+                        "HSourceName": data.鐢熶骇璧勬簮鍚嶇О,
+                        "HGroupID": data.HGroupID,
+                        "HGroupName": data.鐢熶骇鐝粍鍚嶇О,
+                        "HEmpID": data.HEmpID,
+                        "HEmpName": data.鎿嶄綔鍛樺悕绉�,
+                        "HDeptID": data.HDeptID,
+                        "HDeptName": data.閮ㄩ棬鍚嶇О,
+                        "HProcNumber": data.宸ュ簭浠ｇ爜,
+                        "HProcName": data.宸ュ簭鍚嶇О,
+                        "HProcID": data.HProcID
+                    });
+                    layer.close(index);
+                }
+                , error: function () {
+                    layer.close(index);
+                    layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                }
+            })
+        }
+            //#endregion
+
+        //鍏抽敭浠舵竻鍗�
+        function set_InitGrid() {
+            option= {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , page: false
+                , totalRow: true
+                , cellMinWidth: 120
+                , data: []
+                , height: 285
+                , limit: 10
+                , cols: [[ //缁戝畾淇℃伅琛�
+                    { type: 'numbers', title: '搴忓彿', width: 50 }
+                    , { field: 'HBarCode_P', title: '浜у搧鐮�', width: 265 }
+                    , { field: 'HBarCode', title: '閰嶄欢鐮�', width: 265 }
+                    , { field: 'HPartsQty', title: '閰嶄欢鏁�', width: 72 }
+                    , { field: 'HBindingQty', title: '宸茬粦鏁�', width: 72 }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 160 }
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 160 }
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 160, hide: true }
+                    , { field: 'HBatchNo', title: '鎵规', width: 160, hide: true }
+                    , { field: 'HSourceID', title: 'HSourceID', width: 160, hide: true }
+                    , { field: 'HEquipID', title: 'HEquipID', width: 160, hide: true }
+                    , { field: 'HGroupID', title: 'HGroupID', width: 160, hide: true }
+                    , { field: 'HWorkerID', title: 'HWorkerID', width: 160, hide: true }
+                    , { field: 'HScanDate', title: 'HScanDate', width: 160, hide: true }
+                    , { field: 'HSourceInterID', title: 'HSourceInterID', width: 160, hide: true }
+                    , { field: 'HSourceEntryID', title: 'HSourceEntryID', width: 160, hide: true }
+                    , { field: 'HSourceBillNo', title: 'HSourceBillNo', width: 160, hide: true }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 66 }
+                ]]
+            }
+            option2 = {
+                elem: '#mainTable2'
+                , toolbar: '#toolbarDemo2'
+                , page: false
+                , totalRow: true
+                , cellMinWidth: 120
+                , data: []
+                , height: 385
+                , limit: 10
+                , cols: [[
+                    { type: 'numbers', title: '搴忓彿' }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
+                    , { field: '閰嶄欢浠ｇ爜', title: '閰嶄欢浠ｇ爜' }
+                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О' }
+                    , { field: '閰嶄欢瑙勬牸', title: '閰嶄欢瑙勬牸' }
+                    , { field: '閰嶄欢鏁伴噺', title: '閰嶄欢鏁伴噺', totalRow: true }
+                    , { field: 'HBatchNo', title: '褰撳墠鎵规' }
+                    , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
+                    , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    , { field: 'HICMOBillNo', title: 'HICMOBillNo', hide: true }
+                    , { field: 'HProcExchInterID', title: 'HProcExchInterID', hide: true }
+                    , { field: 'HProcExchEntryID', title: 'HProcExchEntryID', hide: true }
+                    , { field: 'HProcExchBillNo', title: 'HProcExchBillNo', hide: true }
+                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                    , { field: 'HBarCode', title: 'HBarCode', hide: true }
+                ]]
+            }
+
+                // 鐗╂枡琛ㄦ牸涓嬫媺鎼滅储妗�
+            tableSelect.render({
+                elem: '#HProcExchBillNo',
+                checkedKey: 'hmainid',
+                searchKey: '鍗曟嵁鍙�',
+                sWhere: '',//table鎼滅储sWhere鏉′欢
+                table: {
+                    url: GetWEBURL() + 'LEMS/Sc_ProcessExchangeBillList_Query_byPage',
+                    where: { user: sessionStorage["HMaker"], "Organization": sessionStorage["Organization"],"HBillSubType":3772 },
+                    cols: [[
+                        { type: 'checkbox', fixed: 'left' },
+                        { field: 'hmainid', title: 'hmainid', hide: true },
+                        { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' },
+                        { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' },
+                        { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' },
+                        { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸' },
+                        { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' },
+                        { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
+                    ]],
+                    page: true,
+                    limit: 5,
+                    limits: [5]
+                },
+                done: function (elem, data) {
+                    if (data != []) {
+                        //鑾峰彇鏁版嵁
+                        createBillNo();
+                        txtHProcExch_KeyDown(data.data[0].鍗曟嵁鍙�);
+                        $("#HProcExchBillNo").val(data.data[0].鍗曟嵁鍙�);
+                        $("#HProcExchInterID").val(data.data[0].hmainid);
+                        $("#HMaterNumber").val(data.data[0].浜у搧浠ｇ爜)
+                        $("#HMaterName").val(data.data[0].浜у搧鍚嶇О)
+                        $("#HMaterModel").val(data.data[0].浜у搧瑙勬牸)
+                        $("#HICMOBillNo").val(data.data[0].浠诲姟鍗曞彿)
+                        $("#HICMOEntryID").val(data.data[0].HICMOEntryID)
+
+                        $("#HBarCode_Key").focus();
+                    }
+
+                }
+            })
+
+            table.render(option);
+            table.render(option2);
+        }
+        
+        //浜у搧SN闀洉鐮佺爜鍥炶溅鏌ヨ
+        function txtHBarCodeSN_KeyDown(HBarCode) {
+            if (checkHProcExchAndHBarCodeSN(HBarCode)) {
+                //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+                if (areQuantitiesEqual(option.data)) {
+                    //淇濆瓨鍏抽敭浠�
+                    if (AllowLoadData()) {
+                        set_SaveBill();
+                    }
+                }
+            } else {
+                return layer.alert("娴佽浆鍗″拰闀洉鐮佷笉涓�鑷达紝璇锋鏌�")
+            }
+
+        }
+
+        //浜у搧娴佽浆鍗¤繑鍥濨om
+        function txtHProcExch_KeyDown(HBarCode) {
+            //涓昏〃淇℃伅鏌ヨ
+            var indexs = layer.load();
+            //閰嶄欢淇℃伅鏌ヨ
+            var HBillNo = $("#HBillNo").val();
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/HBardCodeBomListByHProcExch_XW",
+                async: false,
+                data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HProcID": $("#HProcID").val(), "HOrgID": sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data
+
+                        rowarr = [];
+                        for (var i = 0; i < data.length; i++) {
+                            rowarr.push({
+                                "HBarCode_P": data[i].浜у搧鐮�, "HPartsBarCode": "", "HPartsQty": data[i].鍒嗗瓙瀛愰」鐢ㄩ噺, "HBindingQty": 0
+                                , "HMaterID": data[i].瀛愰」鐗╂枡ID, "HMaterNumber": data[i].瀛愰」鐗╂枡浠ｇ爜, "HMaterName": data[i].瀛愰」鐗╂枡鍚嶇О, "HMaterModel": data[i].瀛愰」瑙勬牸鍨嬪彿, "HBatchNo": ""
+                                , "HSourceID": $("#HSourceID").val(), "HEquipID": 0, "HGroupID": $("#HGroupID").val(), "HWorkerID": $("#HEmpID").val()
+                                , "HScanDate": new Date(), "HSourceInterID": $("#HICMOInterID").val()
+                                , "HSourceEntryID": $("#HICMOEntryID").val(), "HSourceBillNo": $("#HICMOBillNo").val()
+                            });
+                        }
+
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+
+                        table.render(option);
+                        layer.close(indexs);
+                        //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+                        $("#HBarCode_Key").focus();
+                        
+                    }
+                    else {
+                        layer.close(indexs);
+                        layer.confirm(data1.Message);
+                    }
+                },
+                error: function (err) {
+                    layer.close(indexs);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+
+        }
+
+        //閰嶄欢鐮佸洖杞︽煡璇�
+        function txtHBarCodeKey_KeyDown(HBarCode) {
+            var indexs = layer.load();
+            var HBillNo = $("#HBillNo").val();
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/BarCodeBillBomBindByHProcExch_XW",
+                async: false,
+                data: { "HBillNo": HBillNo, "HBarCode": HBarCode, "HBarCode_P": $('#HProcExchBillNo').val(), "HProcID": $('#HProcID').val(), "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data
+
+                        for (var i = 0; i < option.data.length; i++) {
+                            if (data[0].HMaterID == option.data[i].HMaterID && option.data[i].HBindingQty < option.data[i].HPartsQty) {
+                                option.data[i].HMaterID = data[0].HMaterID
+                                option.data[i].HMaterNumber = data[0].鐗╂枡浠ｇ爜
+                                option.data[i].HMaterName = data[0].鐗╂枡鍚嶇О
+                                option.data[i].HMaterModel = data[0].瑙勬牸鍨嬪彿
+                                option.data[i].HBarCode = data[0].閰嶄欢鐮�
+                                option.data[i].HBindingQty = option.data[i].HBindingQty + 1
+                                $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓厤浠�:" + data[0].鐗╂枡鍚嶇О);
+                                break;
+                            } else if (data[0].HMaterID == option.data[i].HMaterID && i == option.data.length - 1) {
+                                layer.msg("绗�" + (i + 1) + "琛屽凡鍏ㄩ儴缁戝畾锛岃鍕胯秴閲忕粦瀹�");
+                            } else if (data[0].HMaterID != option.data[i].HMaterID && i == option.data.length - 1) {
+                                layer.msg("鎵�鎵厤浠剁爜锛�" + HBarCode + " ,瀵瑰簲鐗╂枡涓嶅湪鐢熶骇鐢ㄦ枡娓呭崟涓紒");
+                            }
+                        }
+
+                        //option.data = rowarr;
+
+                        table.render(option);
+                        //鍏夋爣璺宠浆鍒伴厤浠剁爜鏂囨湰妗嗕笂
+                        $("#HBarCode_Key").focus();
+                        $("#HBarCode_Key").val("");
+                        //濡傛灉閰嶄欢閰嶅畬鑷甫鎻愪氦
+                        if (areQuantitiesEqual(option.data)) {
+                            //淇濆瓨鍏抽敭浠�
+                            $("#HBarCode_SN").val("");
+                            $("#HBarCode_SN").focus();
+                        }
+                        layer.close(indexs);
+                    }
+                    else {
+                        layer.close(indexs);
+                        layer.confirm(data1.Message);
+                    }
+                },
+                error: function (err) {
+                    layer.close(indexs);
+                    layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                }
+            });
+        }
+
+        //鏍￠獙闀洉鐮佸拰娴佽浆鍗′俊鎭槸鍚︿竴鑷�
+        function checkHProcExchAndHBarCodeSN(HBarCode) {
+            let result = false
+            //鑾峰彇瀵瑰簲涓昏〃淇℃伅
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Cj_SingleStation/checkHBarCode_Batch",
+                async: false,
+                data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"], "HOrgID": sessionStorage["OrganizationID"] },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        if (data1.data[0]["HSourceEntryID"] == $("#HICMOEntryID").val() && data1.data[0]["HSourceBillNo"] == $("#HICMOBillNo").val()) {
+                            result = true;
+                        }
+                    }
+                },
+                error: function (err) {
+                    
+                }
+            });
+            return result;
+        }
+
+
+
+        //鍔犺浇鍘嗗彶杩囩珯娓呭崟淇℃伅
+        function get_Display(sWhere = '') {
+            var ajaxLoad = layer.load();
+            var HProcID = $("#HProcID").val();
+            var HSourceID = $("#HSourceID").val();
+            sWhere += ` and HProcID = ${HProcID} and HSourceID = ${HSourceID}`
+            $.ajax({
+                url: GetWEBURL() + '/Cj_SingleStation/SingleStationOutBillList',
+                async: false,
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = [];//鍒楀瓧娈垫暟鎹�
+                        var col = [];
+                        var titleData = []
+                        var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鎵撳嵃鏉＄爜鏁伴噺", "鏈墦鍗版潯鐮佹暟閲�", "瀹炴敹鏁伴噺", "閲戦"];
+                        //缁欑┖鐨勬暟缁勮祴鍊�
+                        for (var key in data1.list) {
+                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                        }
+                        //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                        for (var i = 0; i < data.length; i++) {
+                            // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                            if ($.inArray(data[i].name, titleData) > -1) {
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                            }
+                            else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                            } else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                        return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                    }, style: 'cursor: pointer;'
+                                });
+                            } else if (data[i].name == '褰撳墠瀹℃牳椤圭洰') {//娣诲姞瓒呴摼鎺�
+                                col.push({
+                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '褰撳墠瀹℃牳椤圭洰', templet: function (d) {
+                                        return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
+                                    }, style: 'cursor: pointer;'
+                                });
+                            } else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                }
+                            }
+                        }
+                        option2.cols = [col]
+                        option2.data = data1.data;
+
+
+
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option2, []);
+
+                        table.render(option2);
+                        layer.close(ajaxLoad);
+                        //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //#region 淇濆瓨鏂规硶
+        function set_SaveBill() {
+            var data = {
+                "field": {
+                    "HProcID": $("#HProcID").val(), "HBatchNo": "",
+                    "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
+                    "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
+                }
+            };
+            var sMainStr = JSON.stringify(data.field);
+            var HBarCode = $("#HBarCode_SN").val();
+            var sSubStr = JSON.stringify(option.data);
+            var sMainSub = sMainStr + ';' + HBarCode + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+            var indexs = layer.load();
+            $.ajax({
+                type: "POST",
+                url: GetWEBURL() + "/Cj_SingleStation/AddStationOutBillAndAssemblyBill",
+                async: false,
+                data: { "sMainSub": sMainSub },
+                dataType: "json",
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        layer.close(indexs);
+                        option.data = JSON.parse(JSON.stringify(rowarr));
+                        table.render(option);
+                        $("#HReturnMessage").text("鎴愬姛杩囩珯鎵爜涓�涓骇鍝�:" + HBarCode);
+                        //鍒囨崲浜у搧
+                        $("#HBarCode_SN").val("");//浜у搧鐮佹枃鏈鍐呭娓呯┖
+                        $("#HBarCode_Key").focus();//鍏抽敭浠舵枃鏈閫変腑
+                        get_Display();
+                    }
+                    else {
+
+                        layer.close(indexs);
+                        layer.msg(data1.Message, { icon: 5, btn: ["纭"], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "鍑虹幇閿欒" });
+                    }
+
+                },
+                error: function (err) {
+
+                    layer.close(indexs);
+                    layer.msg(get_MessageError("閿欒:" + err, sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-008]纭', sessionStorage["HTranSlate"])], time: 100000, offset: 't', skin: 'layui-layer-lan', title: get_MessageError("[0000-2-009]娓╅Θ鎻愮ず", sessionStorage["HTranSlate"]) });
+                }
+            });
+        }
+        //#endregion
+
+        //鍒犻櫎鍗曟嵁
+        function btn_Delete() {
+            var checkStatus = table.checkStatus('mainTable2')
+                , data = checkStatus.data;
+            if (checkStatus.data.length === 1) {
+                layer.confirm(get_MessageError('[0000-1-003]纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', sessionStorage["HTranSlate"]), function (index) {
+                    var ajaxLoad = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBillandAssemblyBill',
+                        type: "GET",
+                        data: { "HInterID": data[0].hmainid, "HBarCode_P": data[0].闀洉SN鐮�, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                get_Display();
+                                layer.close(ajaxLoad);
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(get_MessageError(result.Message, sessionStorage["HTranSlate"]) + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
+                        }
+                    });
+                    layer.close(index);
+                });
+            } else {
+                layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+            }
+        }
+
+        // 鐢熸垚鍗曟嵁鍙�
+        function createBillNo() {
+            //閲嶆柊鑾峰彇鍗曟嵁鍙�
+            $.ajax({
+                url: GetWEBURL() + "/Web/GetMAXNumPDA",
+                type: "GET",
+                async: false,
+                data: { "HBillType": '3727' },
+                success: function (d) {
+                    //$("#HInterID").val(d.data[0].HInterID);
+                    $("#HBillNo").val(d.data[0].HBillNo);
+                    //$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));  //榛樿涓哄綋鍓嶆棩鏈�
+                    //閲嶆柊鍚敤淇濆瓨鎸夐挳
+                    //$("#btnSave").removeClass("layui-btn-disabled").attr("disabled", false);
+                }
+            });
+        }
+
+        //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+        function set_GridDelete(obj) {
+            var data = obj.data;
+            var rowIndex = $(obj.tr).attr("data-index");
+            if (obj.event === 'del') {
+                layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+
+                    var wait = layer.load();
+                    //鍒犻櫎涓存椂琛ㄦ暟鎹�
+                    $.ajax({
+                        url: GetWEBURL() + 'Deltet_Sc_AssemblyBill_BindBarCodeTemp',
+                        type: "GET",
+                        data: { "HBillNo": $("#HBillNo").val(), "HBarCode": option.data[rowIndex].HBarCode, "user": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1, time: 500 }, function () {
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(wait);
+                                });
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                                layer.close(wait);
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            layer.close(wait);
+                        }
+                    });
+
+
+                    //鍒锋柊琛ㄦ牸鏁版嵁
+                    option.data[rowIndex].HBarCode = "";
+                    option.data[rowIndex].HBindingQty = 0;
+                    //option.data[rowIndex].HMaterID = 0;
+                    option.data[rowIndex].HMaterNumber = "";
+                    option.data[rowIndex].HMaterName = "";
+                    option.data[rowIndex].HMaterModel = "";
+                    option.data[rowIndex].HBarCode = "";
+
+                    table.render(option);
+                    layer.close(index);
+                });
+            }
+        }
+
+        //鍛樺伐閫夋嫨椤甸潰
+        function btnHEmp() {
+            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(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HEmpID").val(checkStatus.data[0].HItemID);
+                    $("#HEmpName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+            })
+        }
+
+
+        //鐢熶骇璧勬簮閫夋嫨椤甸潰
+        function btnHSource() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐢熶骇璧勬簮鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length === 0) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HSourceID").val(checkStatus.data[0].HItemID);
+                    $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О);
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鐢熶骇鐝粍閫夋嫨椤甸潰
+        function btnHGroup() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '鐝粍琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    if (checkStatus.data.length != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HGroupID").val(checkStatus.data[0].HItemID);//鐝粍id
+                    $("#HGroupName").val(checkStatus.data[0].鐝粍鍚嶇О);//璁￠噺鍗曚綅鍚嶇О
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //鐢熶骇杞﹂棿閫夋嫨椤甸潰
+        function btnHDept() {
+            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 != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HDeptID").val(checkStatus.data[0].HItemID);//
+                    $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        //宸ュ簭閫夋嫨椤甸潰
+        function btnHProc() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '宸ュ簭鍒楄〃'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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 != 1) {
+                        return layer.msg(get_MessageError('[0000-1-020]璇烽�夋嫨鏁版嵁', sessionStorage["HTranSlate"]));
+                    }
+                    //鑾峰彇鏁版嵁
+                    $("#HProcID").val(checkStatus.data[0].HItemID);//
+                    $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠ｇ爜);
+                    $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+        function btnHProcExch() {
+            layer.open({
+                type: 2//寮圭獥绫诲瀷
+                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                , area: ['90%', '90%']//澶у皬
+                , title: '娴佽浆鍗″垪琛�'//鏍囬
+                , shift: 2//寮瑰嚭鍔ㄧ敾
+                , content: ['../../杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html', 'yes']
+                , btn: ['纭畾', '鍙栨秷']
+                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    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('璇烽�夋嫨鏁版嵁');
+                    }
+                    
+
+                    createBillNo();
+                    txtHProcExch_KeyDown(checkStatus.data[0].鍗曟嵁鍙�);
+                    $("#HProcExchBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                    $("#HProcExchInterID").val(checkStatus.data[0].hmainid);
+                    $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜)
+                    $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О)
+                    $("#HMaterModel").val(checkStatus.data[0].浜у搧瑙勬牸)
+                    $("#HICMOBillNo").val(checkStatus.data[0].浠诲姟鍗曞彿)
+                    $("#HICMOEntryID").val(checkStatus.data[0].HICMOEntryID)
+
+                    $("#HBarCode_Key").focus();
+
+                    layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                }
+                , btn2: function (index, layero) { }
+            })
+        }
+
+
+        //闈炵┖楠岃瘉
+        function AllowLoadData() {
+
+            var HBarCode = $("#HBarCode_SN").val();
+            if (HBarCode == "") {
+                layer.msg(get_MessageError("[0000-2-019]浜у搧SN涓嶈兘涓虹┖!", sessionStorage["HTranSlate"]))
+                return false;
+            }
+            var sSubStr = JSON.stringify(table.cache['mainTable']);
+
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HBarCode == "" || sSubStr[i].HBarCode == undefined || sSubStr[i].HBarCode == null) {
+                        layer.msg("缁戝畾淇℃伅绗�" + (i + 1) + "琛�,閰嶄欢鐮佹湭缁戝畾!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return Result = false;
+                    }
+                }
+            } else {
+                layer.msg("閰嶄欢缁戝畾淇℃伅涓嶅厑璁镐负绌�!", { icon: 5, btn: ['纭'], time: 4000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return Result = false;
+            }
+
+
+            //var HBadReasonID = $("#HBadReasonID").val();
+            //if (HBadReasonID == 0) {
+            //    layer.msg("涓嶈壇鍘熷洜涓嶈兘涓虹┖!")
+            //    return false;
+            //}
+            return true;
+        }
+        //鍒ゆ柇鏄惁缁戝畾瀹�
+        function areQuantitiesEqual(arr) {
+            if (arr.length === 0) {
+                return false; // 绌烘暟缁勯粯璁よ涓烘弧瓒虫潯浠�
+            }
+
+            const firstHPartsQty = arr[0].HPartsQty;
+            const firstHBindingQty = arr[0].HBindingQty;
+
+            for (let i = 1; i < arr.length; i++) {
+                if (arr[i].HPartsQty !== firstHPartsQty || arr[i].HBindingQty !== firstHBindingQty) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        //#endregion
+
+    });
+    function GetHEmpValue(obj)  //杩斿洖鑱屽憳
+    {
+        $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+        $("#HEmpID").val(obj[0].HItemID);
+        
+    }
+    function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+    {
+        $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+        $("#HDeptID").val(obj[0].HItemID);
+    }
+    function GetHGroupValue(obj)  //杩斿洖鐝粍
+    {
+        $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+        $("#GroupID").val(obj[0].HItemID);
+    }
+    function GetProcessValue(obj)  //杩斿洖宸ュ簭
+    {
+        $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+        $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//
+        $("#HProcID").val(obj[0].HItemID);
+    }
+    function GetGySource(obj)  //杩斿洖鐢熶骇璧勬簮
+    {
+        $("#HSourceName").val(obj[0].鐢熶骇璧勬簮鍚嶇О);
+        $("#HSourceID").val(obj[0].HItemID);
+    }
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
index 137d559..8c7b775 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_checkSN.html"
@@ -522,7 +522,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": "",
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
index cba9f25..6a72f00 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_ProcessItemStationPlatform_generateSNCode.html"
@@ -18,6 +18,7 @@
     <script src="../../../layuiadmin/MESLanguage.js"></script>
     <script src="../../../layuiadmin/SetColumn.js"></script>
     <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/grwebapp.js"></script>
 </head>
 <body>
     <div class="layui-fluid" style="padding: 0;">
@@ -83,11 +84,11 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px; color: red; ">鎵撳嵃妯℃澘</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
-                                                <select name="HPrintTemplate" id="HPrintTemplate" lay-filter="HPrintTemplate" >
-                                                    <option>鎵撳嵃妯℃澘1</option>
-                                                    <option>鎵撳嵃妯℃澘2</option>
+                                            <label class="layui-form-label">妯℃澘鍚嶇О</label>
+                                            <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+                                                <select name="HPrintTemplate" id="HPrintTemplate" class="ForFilteringSchemes" lay-filter="HPrintTemplate"
+                                                        lay-verify="HPrintTemplate">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                                 </select>
                                             </div>
                                         </div>
@@ -281,6 +282,21 @@
         //#endregion
 
         //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+
+        form.on('select(HPrintTemplate)', function (data) {
+            // 2. 鑾峰彇閫変腑鐨勫��
+            const selectedValue = data.value;
+
+            // 3. 淇濆瓨鍒� localStorage锛堥敭鍚嶄负 "BlueToothselectedTemplate"锛�
+            localStorage.setItem('SNselectedTemplate', selectedValue);
+
+            // 濡傛灉闇�瑕佷細璇濈骇瀛樺偍锛堟祻瑙堝櫒鍏抽棴鍚庢竻闄わ級锛屾敼鐢� sessionStorage锛�
+            // sessionStorage.setItem('selectedTemplate', selectedValue);
+
+            console.log('宸蹭繚瀛橀�夋嫨鐨勬ā鏉�:', selectedValue);
+        });
+
         //澶村伐鍏锋爮浜嬩欢
         table.on('toolbar(mainTable)', function (obj) {
             switch (obj.event) {
@@ -365,6 +381,31 @@
 
         //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
 
+        //#region 鑾峰彇鎵撳嵃妯℃澘
+        function getTem() {
+            //鑾峰彇鐧诲綍椤电粍缁囧垪
+            $.ajax({
+                type: "get",
+                async: false,
+                url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
+                data: { "HNumber": "HGy_BarCodeBill" },
+                success: function (result) {
+                    var template = "";
+                    if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                        var data = result.data;
+                        for (var i = 0; i < data.length; i++) {
+                            template += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
+                        }
+                        $("#HPrintTemplate").append(template);
+                        $("#HPrintTemplate").val(localStorage.getItem('SNselectedTemplate'))
+                        form.render('select');
+                    }
+                    layer.closeAll("loading");
+                }
+            })
+        }
+            //#endregion
+
         //鍒濆鍖栫晫闈�
         function set_ClearBill() {
             //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ祦杞崱涓�
@@ -378,6 +419,8 @@
             set_InitGrid();
             //
             get_Display();
+
+            getTem();
         }
 
         //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊�
@@ -423,7 +466,7 @@
                 , totalRow: true
                 , cellMinWidth: 120
                 , data: []
-                , height: 400
+                , height: 550
                 , limit: 10
                 , cols: [[
                     { type: 'numbers', title: '搴忓彿' }
@@ -498,7 +541,7 @@
                 "field": {
                     "HProcID": $("#HProcID").val(), "HBatchNo": "",
                     "HGroupID": $("#HGroupID").val(), "HSourceID": $("#HSourceID").val(),
-                    "HProdOrgID": sessionStorage["OrganizationID"],
+                    "HPRDOrgID": sessionStorage["OrganizationID"],
                     "HEmpID": $("#HEmpID").val(), "HDeptID": $("#HDeptID").val()
                 }
             };
@@ -520,6 +563,8 @@
                         $("#HBarCode_SN").focus();
 
                         $("#HReturnMessage").text("鎴愬姛鎵爜涓�涓�:" + HBarCode);
+                        //鑷姩鎵撳嵃
+                        dy_PL(HBarCode);
                         get_Display();
                     }
                     else {
@@ -537,6 +582,56 @@
             });
         }
 
+        //鎵归噺鎵撳嵃
+        function dy_PL(HBarCode) {
+            var sWhere = "select Top 1 * from h_v_IF_BarCodeBillList with(nolock) where 鏉＄爜缂栧彿 = '" + HBarCode + "'"
+
+            $.ajax({
+                type: "GET",
+                url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                async: false,
+                data: { "sWhere": sWhere },
+                success: function (data) {
+                    if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                        if (data.data.length != 0) {
+
+
+                            var Customer = {
+                                "Table": data.data
+                            }
+
+                            var args = {
+                                type: "print",//鎵撳嵃妯″紡
+                                //type: "preview",//棰勮妯″紡
+                                showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                report: urlAddRandomNo("../../grf/" + $("#HPrintTemplate").val()+".grf"),
+                                data: Customer
+                            };
+
+                            console.log(data.data[0].鏉＄爜缂栧彿);
+                            //var args = {
+                            //    report: urlAddRandomNo("../../grf/cs10.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 });
+                }
+            })
+
+        }
+
         //鍔犺浇缃戞牸鏍规嵁缁戝畾宸ュ簭鍜岀敓浜ц祫婧�
         function get_Display(sWhere = '') {
             var ajaxLoad = layer.load();
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
new file mode 100644
index 0000000..05f91da
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SachetBarCodePrint.html"
@@ -0,0 +1,483 @@
+锘�<!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/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/grwebapp.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn" id="ToolCreate" lay-submit="" lay-filter="ToolCreate">鐢熸垚</button>
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>棣欏泭鏍囩鐢熸垚</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐢熶骇璁㈠崟</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0">
+                                                    <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMO" id="btnSearchICMO" style="width: 40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterNumber" id="HMaterNumber" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" value="0">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterName" id="HMaterName" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaterModel" id="HMaterModel" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎿嶄綔鍛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HMaker" id="HMaker" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎵撳嵃闂撮殧(绉�)</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HTime" id="HTime" autocomplete="off" value="3">
+                                                    
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="tab-TabTest">
+                            <ul class="layui-tab-title">
+                                <li lay-id="1" class="layui-this">鏉＄爜淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>                               
+                            </div>
+                        </div>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>                        
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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 option = [];
+            var option_New = [];
+            var sWhere = "";
+            var HModName = "Cj_SachetBarCodePrint";
+            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+       
+            //#endregion                       
+         
+            //鑾峰彇鍒跺崟浜轰俊鎭�
+            $("#HMaker").val(sessionStorage["HUserName"]);      
+
+            var rowdata = [{
+                "HBarCodeID": 0, "HBarCode": '', "HMaterNumber": '', "HMaterName": '', "HMaterModel": ''
+            }];
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //#endregion                     
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+            //澶村伐鍏锋爮
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];       
+
+                var NewRow = {
+                    "HBarCodeID": 0,"HBarCode": '', "HMaterNumber": '', "HMaterName": '', "HMaterModel": ''
+                };                  
+                
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn(0);
+                        break;
+                }
+            });
+           
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�            
+            });
+
+
+            //#region 鐐瑰嚮琛岄�変腑楂樹寒
+            table.on('row(mainTable)', function (obj) {
+                //閫変腑琛屾敼鍙橀鑹�
+                var flag = !obj.tr.find(':checkbox:first').prop('checked');
+                obj.tr.find(':checkbox').prop('checked', flag);
+                if (flag) {
+                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                } else {
+                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+                    $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+                }
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = flag;
+                    }
+                });
+            })
+            //#endregion
+
+            //閫夋嫨鐢熶骇杞﹂棿寮圭獥
+            form.on('submit(btnSearchICMO)', function () {
+                layer.open({
+                    type: 2
+                    , area: ['90%', '90%']
+                    , title: '鐢熶骇璁㈠崟'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+                        $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
+                        $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMaterID").val(checkStatus.data[0].HMaterID)
+                        $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
+                        $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+                        $("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
+            });
+
+            //鎵撳嵃
+            form.on('submit(ToolPrint)', function (data) {
+                get_PrintReport();
+            })
+
+            //鏉＄爜鐢熸垚
+            form.on('submit(ToolCreate)', function (data) {
+                $('#ToolCreate').addClass("layui-btn-disabled").attr("disabled", true);//鐢熸垚鎸夐挳绂佺敤
+                SaveBarCodeCreate();
+            })         
+          
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栨潯鐮佷俊鎭〃鏍�
+            function set_InitGrid() {
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 75 }
+                    , { field: 'HBarCodeID', title: '鏉＄爜ID', hide: true }
+                    , { field: 'HBarCode', title: '鏉＄爜缂栧彿' }
+                    , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜'}
+                    , { field: 'HMaterName', title: '鐗╂枡鍚嶇О'}
+                    , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , totalRow: true
+                    , cellMinWidth: 75
+                    , height: 'full-255'
+                    , cols: [columns]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , done: function (res, curr, count) {
+                    }
+                };
+                option.data = rowdata;
+                table.render(option);              
+            }
+                    
+              
+
+            //鏉＄爜鐢熸垚
+            function SaveBarCodeCreate() {
+                var HICMOInterID = $("#HICMOInterID").val();
+                var HICMOEntryID = $("#HICMOEntryID").val();
+                var user = $("#HMaker").val();
+
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Cj_SingleStation/SachetBarCodeSave", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "user": user },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var data = result.data;
+                                var dataArr = [];
+                                for (var i = 0; i < result.data.length; i++) {
+                                    dataArr.push({
+                                        "HBarCodeID": data[i].HBarCodeID,"HBarCode": data[i].鏉＄爜缂栧彿, "HMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterModel": data[i].瑙勬牸鍨嬪彿
+                                    });
+                                }
+                                //琛ㄦ牸璧嬪��
+                                option.data = dataArr;
+                                table.render(option);
+
+                                //鑷姩鎵撳嵃
+                                if (option.data.length > 0) {
+                                    get_BatchPrint();
+                                }                                
+                            }
+                            else {
+                                $('#ToolCreate').removeClass("layui-btn-disabled").attr("disabled", false);//鐢熸垚鎸夐挳鍚敤
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert(err.Message, { icon: 5 });
+                        }
+                    });
+            }
+
+            //鎵归噺鎵撳嵃
+            var time;
+            var num = 0;
+            function get_BatchPrint() {
+                //鎵撳嵃闂撮殧
+                var HTime = $("#HTime").val();
+
+                time = setInterval(function () {
+                    dy_PL(option.data);
+                }, HTime*1000);
+            }
+
+            function dy_PL(rest) {
+                var HItemID = rest[num].HBarCodeID.toString();
+                var sWhere = "select top 1 HBarCode 鏉＄爜缂栧彿,isnull(ms.HCusRelationNumber,'') SKU from Gy_BarCodeBill a with(nolock) left join Gy_Material m with(nolock) on a.HMaterID = m.HItemID left join Gy_MateNumRelation_Sec ms with(nolock) on m.HMASTERID = ms.HMaterID where a.HItemID = " + HItemID
+
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "sWhere": sWhere },
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+                            if (data.data.length != 0) {
+                                if (data.data[0].SKU == "") {
+                                    layer.msg("鐗╂枡SKU鏈淮鎶わ紝璇疯仈绯荤鐞嗗憳纭锛�");
+                                    return;
+                                }
+
+                                var dataPrint = [];
+                                for (var i = 0; i < data.data.length; i++) {
+                                    dataPrint.push(data.data[i])
+                                }
+
+                                var Customer = {
+                                    "Table": dataPrint
+                                }
+
+                                var args = {
+                                    type: "print",//鎵撳嵃妯″紡
+                                    //type: "preview",//棰勮妯″紡
+                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+                                    report: urlAddRandomNo("../../grf/棣欏泭妯℃澘JSON.grf"),
+                                    data: Customer
+                                };
+
+                                console.log("鎵撳嵃棣欏泭鏉＄爜锛�" + data.data[0].鏉＄爜缂栧彿);
+                                //var args = {
+                                //    report: urlAddRandomNo("../../grf/cs10.grf"),
+                                //    data: Customer
+                                //};
+                                webapp_ws_ajax_run(args);
+
+                                if (rest.length <= num + 1) {
+                                    num = 0;
+                                    clearInterval(time);
+                                } else {
+                                    num++;
+                                }
+
+                                //var sql = "update a set HPrintQty = HPrintQty + 1 from Gy_BarCodeBill a with(nolock) where HItemID = " + HInterID ;
+                                //$.ajax({
+                                //    type: "GET",
+                                //    url: GetWEBURL() + "/Gy_SOPBillList/UpDelSQL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                //    async: false,
+                                //    data: { "sWhere": sql },
+                                //    success: function (result) {
+                                //        if (result.data.code != 1) {
+                                //            layer.alert("鏇存柊鎵撳嵃鏃ユ湡寮傚父锛�" + result.data.Message);
+                                //        }
+                                //    }
+                                //})
+
+                            } else {
+                                layer.msg("鏌ユ棤鏁版嵁!");
+                            }
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5 });
+                    }
+                })
+
+            }
+
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                var Result = true;
+                if ($("#HICMOInterID").val() == 0 || $("#HICMOEntryID").val() == 0 || $("#HMaterID").val() == 0 || $("#HMaker").val() == "") {
+                    layer.msg("鐢熶骇璁㈠崟锛岀墿鏂�,鎿嶄綔鍛樹俊鎭己澶憋紝璇锋鏌ワ紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                
+                return Result;
+            }
+            //#endregion
+        });
+
+        function GetICMOBillValue(obj) {  //鐢熶骇璁㈠崟
+            $("#HICMOInterID").val(obj[0].hmainid);
+            $("#HICMOEntryID").val(obj[0].HEntryID);
+            $("#HICMOBillNo").val(obj[0].鍗曟嵁鍙�);
+            $("#HMaterID").val(obj[0].HMaterID);
+            $("#HMaterNumber").val(obj[0].浜у搧浠ｇ爜);
+            $("#HMaterName").val(obj[0].浜у搧鍚嶇О);
+            $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);
+        }
+    </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/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html"
new file mode 100644
index 0000000..35d3e9c
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231_\345\260\217\345\215\253/Cj_SaveSNByICMO.html"
@@ -0,0 +1,259 @@
+锘�<!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/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/grwebapp.js"></script>
+    <style type="text/css">
+
+        /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        /*end*/
+        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
+            margin-left: 35%;
+        }
+
+        .layui-input-block {
+            margin-left: 0px;
+        }
+    </style>
+</head>
+<body>
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-input-block">
+                                <!--<button type="button" class="layui-btn" id="ToolPrint" lay-submit="" lay-filter="ToolPrint">棰勮鎵撳嵃</button>-->
+                                <button type="button" class="layui-btn" id="ToolExit" lay-submit="" lay-filter="ToolExit">閫�鍑�</button>
+                                <button type="button" class="layui-btn" id="save" lay-submit="" lay-filter="save">鎻愪氦</button>
+                            </div>
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>闀洉鐮佷笂浼�</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">SN鍓嶇紑</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HSN" id="HSN" autocomplete="off" style="background-color: #efefef4d;" readonly>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浠诲姟鍗曞彿<label style="color:red"> * </label></label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                    <input type="hidden" class="layui-input" name="HICMOInterID" id="HICMOInterID" value="0" style="background-color:#efefef4d;" readonly>
+                                                    <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">寮�濮嬪簭鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HBeginNo" id="HBeginNo" autocomplete="off" style="background-color: #efefef4d;" >
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">缁撴潫搴忓彿</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HEndNo" id="HEndNo" autocomplete="off" style="background-color: #efefef4d;" >
+                                                </div>
+                                            </div>
+                                            
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>                        
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+            var closeType = 2;  //鍏抽棴绫诲瀷
+        } else {
+            debugger;
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+            var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙ｆā鍧�
+        }).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 option = [];
+       
+            //#endregion 
+
+              
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+            //#endregion                     
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+
+
+            //琛ㄥご淇℃伅鐢熶骇浠诲姟鍗曞脊绐�
+            form.on('submit(btnSearchICMOBill)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐢熶骇浠诲姟鍗曞垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['90%', '90%'],
+                    maxmin: true,
+                    content: ['../../鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html?openType=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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HICMOInterID").val(checkStatus.data[0].hmainid);
+                        $("#HICMOEntryID").val(checkStatus.data[0].HEntryID);
+                        $("#HICMOBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
+                        $("#HMaterNumber").val(checkStatus.data[0].浜у搧浠ｇ爜);
+                        $("#HMaterName").val(checkStatus.data[0].浜у搧鍚嶇О);
+                        $("#HMaterID").val(checkStatus.data[0].HMaterID);
+                        $("#HICMOQty").val(checkStatus.data[0].鐢熶骇浠诲姟鍗曟暟閲�);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+          
+            //閫�鍑�
+            form.on('submit(ToolExit)', function (data) {
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            form.on('submit(save)', function (data) {
+                SaveSNByICMO();
+            });
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+
+           
+            //鏉＄爜鐢熸垚
+            function SaveSNByICMO() {
+
+                var HBillNo = $("#HBillNo").val();
+                var HSN = $("#HSN").val();
+                var HBeginNo = $("#HBeginNo").val();
+                var HEndNo = $("#HEndNo").val();
+                if (HBillNo == "" || HSN == "" || HBeginNo == "" || HEndNo == "") {
+                    
+                    layer.alert("璇锋鏌ヤ俊鎭�");
+                    return
+                }
+                var wait = layer.load();
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_BarCode/SaveSNByICMO_XW", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "HBillNo": HBillNo, "HSN": HSN, "HBeginNo": HBeginNo, "HEndNo": HEndNo, "HCount": HBeginNo - HEndNo, "HMachineCode": "PC" },
+                        success: function (result) {
+                            if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.close(wait);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            else {
+                                layer.close(wait);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                            layer.close(wait);
+                        },
+                        error: function (err) {
+                            layer.close(wait);
+                            layer.alert(err.responseText, { icon: 5 });
+                        }
+                    });
+            }
+            //#endregion
+        });
+
+        function GetMaterValue(obj) {
+            //鑾峰彇鏁版嵁
+            $("#HMaterID").val(obj[0].HItemID);//鐗╂枡id
+            $("#HMaterName").val(obj[0].鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+            $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);//鐗╂枡浠ｇ爜
+            $("#HMaterModel").val(obj[0].瑙勬牸鍨嬪彿);//瑙勬牸鍨嬪彿
+            if ($("#HName").val() == "") {
+                $("#HName").val(obj[0].鐗╂枡浠ｇ爜);
+            }
+        }
+    </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/\345\267\245\345\272\217\346\265\201\350\275\254/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
index a4bff63..42aa032 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/MES_StationOutBill_PDA.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/MES_StationOutBill_PDA.html"
@@ -207,7 +207,7 @@
                                             <tr>
                                                 <th>鎿嶄綔鍛�</th>
                                                 <td class="bz_td">
-                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;">
+                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="鎿嶄綔鍛樹唬鐮�" autocomplete="off" class="layui-input" style="border-radius: 50px;" onclick="this.select()">
                                                     <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">纭畾</button>
                                                 </td>
                                                 <td class="bz_td">
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index be0e31e..98162fc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -248,6 +248,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>鍏抽棴</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>鍙嶅叧闂�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" 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_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
                                 <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -444,6 +446,12 @@
                         break;
                     //棣栨
                     case 'btn-FirstPieceCheck': set_FirstPieceCheck();
+                        break;
+                    //宸℃
+                    case 'btn-PatrolProcCheck': set_PatrolProcCheck();
+                        break;
+                    //鏈
+                    case 'btn-ProcessCheck': set_ProcessCheck();
                         break;
                     //鍒锋柊
                     case 'get_Refresh': get_Refresh();
@@ -1137,6 +1145,63 @@
             }
 
 
+            //宸℃
+            function set_PatrolProcCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.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=3790&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+                }
+            }
+
+            //鏈
+            function set_ProcessCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HInterID.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=3790&HICMOEntryID=0', 'yes']
+                        , resize: false
+                        , cancel: function () {
+                            btnIs();
+                        }
+                        , end: function () {
+                            get_FastQuery(table, option);
+                        }
+                    })
+                } else {
+                    layer.msg(get_MessageError('[0000-1-001]璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒', sessionStorage["HTranSlate"]));
+                }
+            }
+
+
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
                 var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
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/Kf_WorkShopICStockBillList.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/Kf_WorkShopICStockBillList.html"
index 4a24574..60e4ffb 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/Kf_WorkShopICStockBillList.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/Kf_WorkShopICStockBillList.html"
@@ -41,7 +41,30 @@
                                             <option value="灏忚溅缁戝畾">灏忚溅缁戝畾</option>
                                             <option value="灏忚溅杞Щ">灏忚溅杞Щ</option>
                                             <option value="浠撳簱杞Щ">浠撳簱杞Щ</option>
+                                            <option value="10004">灏忚溅閿佸畾</option>
                                         </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</label>
+                                    <div class="layui-input-block">
+                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes"
+                                                lay-filter="HInitTimeCycle" style="width:190px;">
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+                                               style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                               style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
@@ -72,7 +95,7 @@
                                     <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="HWHID" id="HWHID" value="0" style="display:none">
-                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" name="HWHName" id="HWHName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHID" id="btnHWHID" style="padding: 0 10px; margin-right: 3px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                         </button>
@@ -82,7 +105,7 @@
                                     <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="HSPID" id="HSPID" value="0" style="display:none">
-                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                        <input type="text" class="layui-input" name="HStockPlaceName" id="HStockPlaceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                         <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHStockPlaceID" id="btnHStockPlaceID" style="padding: 0 10px; margin-right: 3px;">
                                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                         </button>
@@ -285,6 +308,23 @@
             //#region 姝ら〉闈㈡墍鏈夋柟娉�
             // 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+                var today = new Date();
+                var twoDaysAgo = new Date();
+                twoDaysAgo.setDate(today.getDate() - 2);
+                //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+                $("#HBeginDate").val(Format(twoDaysAgo, "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�              
                 set_InitGrid();
                 get_FastQuery();
@@ -357,7 +397,23 @@
                 }
             });            
             
+            //#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
             //鏌ヨ
             function get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere) {
                 var index = layer.load(0, { shade: false });
@@ -370,7 +426,7 @@
                     async:false,
                     data: { "HBillType": HBillType, "HCarBarCode": HCarBarCode, "HProcExBillNo": HProcExBillNo, "HMaterNumber": HMaterNumber, "HWHID": HWHID, "HSPID": HSPID, "sWhere": sWhere },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        if (data1.count >-1) {
                             var data = [];
                             var col = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
@@ -447,6 +503,10 @@
 
             //蹇�熸煡璇�
             function get_FastQuery() {
+                var HWHName = $("#HWHName").val(); 
+                var HStockPlaceName = $("#HStockPlaceName").val();
+                var HBeginDate = $("#HBeginDate").val();
+                var HEndDate = $("#HEndDate").val();
                 var HCarBarCode = $('#HCarBarCode').val()
                 var HBillType = $('#HBillType').val()
                 var HProcExBillNo = $('#HProcExBillNo').val()
@@ -525,6 +585,14 @@
                     }
                     sWhere += " and " + ColName2 + " " + com2;
                 }
+                if (HBeginDate && HEndDate) {
+                    sWhere += " and  CONVERT(varchar(100),鎿嶄綔鏃堕棿, 23) between '" + HBeginDate + "' and  '" + HEndDate + "' "
+                }
+                if (HStockPlaceName) {
+                    sWhere += "and 搴撲綅鍚嶇О like '%" + HStockPlaceName + "%'";
+                    
+                }
+                if (HWHName) sWhere += "and 浠撳簱 like '%" + HWHName + "%'";
                 get_Display(HCarBarCode, HBillType, HProcExBillNo, HMaterNumber, HWHID, HSPID, sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
 
@@ -532,6 +600,9 @@
            
             //閲嶇疆蹇�熸煡璇�
             function set_ClearQuery() {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
                 $('#HCarBarCode').val("")
                 $('#HBillType').val("")
                 $('#HProcExBillNo').val("")
@@ -549,6 +620,7 @@
                 $("#ColContent2").val("");
                 $("#ColName2").val("0");
                 $("#Comparator2").val("0");
+                sWhere = "";
                 get_FastQuery();
             }
           
@@ -569,7 +641,24 @@
                 table.exportFile(ins.config.id, option.data, "xls");
             }
             //#endregion
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
 
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
             //浠撳簱
             form.on('submit(btnHWHID)', function () {
                 //椤甸潰灞�-鑷畾涔�
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"
index 17336ab..b5af4db 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/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"
@@ -275,7 +275,8 @@
                     $('#HDate1').prop('disabled', true);
                     $('#HDate2').prop('disabled', true);
 
-                    $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+/*                    $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));*/
+                    $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                     $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
 
                     //鎵ц鏌ヨ鏂规硶
@@ -290,28 +291,30 @@
 
             //#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"));
 
-                //鍔犺浇鏁版嵁鍒扮綉鏍�
+    
+                $("#HInitTimeCycle").val("-1");
+                form.render('select');
+
+   
+                $('#HDate1').prop('disabled', false);
+                $('#HDate2').prop('disabled', false);
+
+                var today = new Date();
+                var twoDaysAgo = new Date();
+                twoDaysAgo.setDate(today.getDate() - 2);
+
+                $("#HDate1").val(Format(twoDaysAgo, "yyyy-MM-dd"));
+                $("#HDate2").val(Format(today, "yyyy-MM-dd"));
+
+                // 鍔犺浇鏁版嵁鍒扮綉鏍�
                 get_FastQuery();
-
             }
 
             //鍒濆鍖栬〃鏍�
@@ -516,7 +519,7 @@
                 $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                 form.render('select');
 
-                $("#HInitTimeCycle").val("1");
+                //$("#HInitTimeCycle").val("-1");
             }
             //#endregion
 
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_AllowedPrintProcExchangeBillList.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_AllowedPrintProcExchangeBillList.html"
index bee0f5b..e502feb 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_AllowedPrintProcExchangeBillList.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_AllowedPrintProcExchangeBillList.html"
@@ -574,7 +574,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 0 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
+                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 2 + '&MyMsg=' + linterid.toString() + '&Type=HProcessExchange', 'yes']
                         , resize: false
                     })
                 }

--
Gitblit v1.9.1