From 7b757da3b613876c592428afd7195f5ede67403f Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 27 二月 2026 15:07:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/成本管理/成本费用调整单/CB_ChangeMoneyBillList.html              | 1334 ++++++++++
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user                |  160 
 WebTM/views/IpadIndex.html                                        |  102 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemAverageType.html      |    4 
 WebTM/views/基础资料/成本基础资料/Add_Edit_Gy_CostAverageType.html          |  347 ++
 WebTM/layuiadmin/modules/numinput.js                              |  367 ++
 WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam.html        |  628 ----
 WebTM/views/设备管理/设备报表/Sb_EquipMentCollectionTechParam_Temp.html   |  540 ---
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html       | 1119 +++++---
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html               |  113 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html                     |    4 
 WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillEdit.html                  |   49 
 WebTM/views/成本管理/成本费用单/CB_ItemMoneyBillList.html                  |    4 
 WebTM/WebTM.csproj.user                                           |    2 
 WebTM/views/仓存管理/生产入库单/Kf_ProductInBillList.html                  |  110 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html                   |   50 
 WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameter_Add_Edit_.html     |  330 ++
 WebTM/views/成本管理/成本费用调整单/CB_ChangeMoneyBillEdit.html              | 1802 +++++++++++++
 WebTM/views/成本管理/费用单引入/CB_ItemMoneyBill_Excel.html                |   80 
 WebTM/views/模治具管理/上模单/Sc_MouldUpperBillEdit.html                  |    6 
 /dev/null                                                         |  380 --
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CostItemFixRate.html          |   49 
 WebTM/views/基础资料/成本基础资料/CB_Wip_excelImport.html                   |   83 
 WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html |    7 
 WebTM/layuiadmin/Scripts/webConfig.js                             |    6 
 WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html   |   15 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html                |   44 
 WebTM/WebTM.csproj                                                |    1 
 WebTM/views/基础资料/公用基础资料/Gy_ConkType.html                          |   98 
 29 files changed, 5,744 insertions(+), 2,090 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 3744af2..f767299 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|2026-02-02T07:19:54.4742719Z;True|2026-02-02T10:31:35.2889726+08:00;True|2026-02-02T10:30:22.0114186+08:00;True|2026-02-02T10:19:31.6468654+08:00;False|2026-02-02T10:19:07.6961464+08:00;True|2026-02-01T17:49:50.2373826+08:00;True|2026-02-01T17:43:45.8367335+08:00;True|2026-02-01T17:37:21.1681222+08:00;True|2026-02-01T17:30:44.8115393+08:00;True|2026-02-01T17:24:34.3543309+08:00;True|2026-02-01T15:55:00.9170790+08:00;False|2026-02-01T15:54:45.9715303+08:00;True|2026-01-30T16:00:15.7297670+08:00;True|2026-01-30T15:58:46.7261928+08:00;True|2026-01-30T15:55:26.3560928+08:00;True|2026-01-30T14:51:41.1899965+08:00;True|2026-01-30T10:44:51.1198066+08:00;False|2026-01-30T10:41:32.7181137+08:00;False|2026-01-29T12:26:43.1557204+08:00;True|2026-01-28T14:34:45.6195441+08:00;True|2026-01-28T12:04:43.8406153+08:00;True|2026-01-28T11:57:46.3318183+08:00;False|2026-01-28T11:57:33.6942821+08:00;False|2026-01-27T19:55:10.5020397+08:00;True|2026-01-22T16:26:15.4335521+08:00;False|2026-01-22T16:24:44.1639214+08:00;True|2026-01-21T12:44:50.7255065+08:00;True|2026-01-21T10:13:53.8661528+08:00;False|2026-01-21T10:13:30.3455869+08:00;True|2026-01-20T15:37:10.5876104+08:00;False|2026-01-20T15:36:09.6295896+08:00;True|2026-01-19T17:34:26.2575062+08:00;False|2026-01-19T17:34:01.4440031+08:00;True|2026-01-15T14:38:27.6246724+08:00;True|2026-01-15T14:32:18.8118329+08:00;False|2026-01-15T14:30:15.4333217+08:00;False|2026-01-15T14:30:03.1289160+08:00;False|2026-01-15T14:29:56.1941035+08:00;True|2026-01-09T14:06:08.1238984+08:00;False|2026-01-09T14:05:52.6015673+08:00;True|2026-01-07T17:42:56.5248615+08:00;False|2026-01-07T17:42:34.6924836+08:00;True|2026-01-05T16:12:27.5690710+08:00;True|2026-01-05T16:12:17.4425684+08:00;False|2026-01-05T16:12:03.0978959+08:00;True|2025-12-23T09:10:23.6893783+08:00;True|2025-12-23T09:07:26.6930977+08:00;False|2025-12-23T09:06:41.0915784+08:00;True|2025-12-23T08:40:29.7405628+08:00;False|2025-12-23T08:40:16.9341083+08:00;True|2025-12-22T17:42:46.9605488+08:00;True|2025-12-22T17:36:17.7159888+08:00;True|2025-12-22T17:24:39.2657970+08:00;False|2025-12-22T17:24:10.9683552+08:00;True|2025-12-22T17:11:32.7698140+08:00;True|2025-12-22T17:10:10.4453151+08:00;True|2025-12-22T17:09:26.6981581+08:00;True|2025-12-22T17:08:10.1973001+08:00;False|2025-12-22T17:08:00.4576327+08:00;True|2025-12-22T14:58:24.8825978+08:00;True|2025-12-22T14:54:31.0433963+08:00;True|2025-12-22T14:37:50.8363212+08:00;True|2025-12-22T14:29:14.1978041+08:00;True|2025-12-22T14:10:01.9969824+08:00;False|2025-12-22T14:09:36.1807155+08:00;True|2025-12-17T16:16:26.7825738+08:00;True|2025-12-17T16:15:16.0559691+08:00;True|2025-12-17T15:44:38.3317392+08:00;True|2025-12-17T10:19:06.7122186+08:00;False|2025-12-17T10:18:52.9280215+08:00;False|2025-12-12T09:23:50.5551285+08:00;True|2025-12-10T17:18:35.0298366+08:00;False|2025-12-10T17:18:13.1365696+08:00;True|2025-12-09T12:08:11.3908592+08:00;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>
+    <History>False|2026-02-26T00:55:53.0918973Z;False|2026-02-25T15:53:33.2256623+08:00;True|2026-02-23T10:04:54.7226911+08:00;True|2026-02-23T09:57:05.9584101+08:00;False|2026-02-23T09:56:48.7304840+08:00;True|2026-02-02T15:19:54.4742719+08:00;True|2026-02-02T10:31:35.2889726+08:00;True|2026-02-02T10:30:22.0114186+08:00;True|2026-02-02T10:19:31.6468654+08:00;False|2026-02-02T10:19:07.6961464+08:00;True|2026-02-01T17:49:50.2373826+08:00;True|2026-02-01T17:43:45.8367335+08:00;True|2026-02-01T17:37:21.1681222+08:00;True|2026-02-01T17:30:44.8115393+08:00;True|2026-02-01T17:24:34.3543309+08:00;True|2026-02-01T15:55:00.9170790+08:00;False|2026-02-01T15:54:45.9715303+08:00;True|2026-01-30T16:00:15.7297670+08:00;True|2026-01-30T15:58:46.7261928+08:00;True|2026-01-30T15:55:26.3560928+08:00;True|2026-01-30T14:51:41.1899965+08:00;True|2026-01-30T10:44:51.1198066+08:00;False|2026-01-30T10:41:32.7181137+08:00;False|2026-01-29T12:26:43.1557204+08:00;True|2026-01-28T14:34:45.6195441+08:00;True|2026-01-28T12:04:43.8406153+08:00;True|2026-01-28T11:57:46.3318183+08:00;False|2026-01-28T11:57:33.6942821+08:00;False|2026-01-27T19:55:10.5020397+08:00;True|2026-01-22T16:26:15.4335521+08:00;False|2026-01-22T16:24:44.1639214+08:00;True|2026-01-21T12:44:50.7255065+08:00;True|2026-01-21T10:13:53.8661528+08:00;False|2026-01-21T10:13:30.3455869+08:00;True|2026-01-20T15:37:10.5876104+08:00;False|2026-01-20T15:36:09.6295896+08:00;True|2026-01-19T17:34:26.2575062+08:00;False|2026-01-19T17:34:01.4440031+08:00;True|2026-01-15T14:38:27.6246724+08:00;True|2026-01-15T14:32:18.8118329+08:00;False|2026-01-15T14:30:15.4333217+08:00;False|2026-01-15T14:30:03.1289160+08:00;False|2026-01-15T14:29:56.1941035+08:00;True|2026-01-09T14:06:08.1238984+08:00;False|2026-01-09T14:05:52.6015673+08:00;True|2026-01-07T17:42:56.5248615+08:00;False|2026-01-07T17:42:34.6924836+08:00;True|2026-01-05T16:12:27.5690710+08:00;True|2026-01-05T16:12:17.4425684+08:00;False|2026-01-05T16:12:03.0978959+08:00;True|2025-12-23T09:10:23.6893783+08:00;True|2025-12-23T09:07:26.6930977+08:00;False|2025-12-23T09:06:41.0915784+08:00;True|2025-12-23T08:40:29.7405628+08:00;False|2025-12-23T08:40:16.9341083+08:00;True|2025-12-22T17:42:46.9605488+08:00;True|2025-12-22T17:36:17.7159888+08:00;True|2025-12-22T17:24:39.2657970+08:00;False|2025-12-22T17:24:10.9683552+08:00;True|2025-12-22T17:11:32.7698140+08:00;True|2025-12-22T17:10:10.4453151+08:00;True|2025-12-22T17:09:26.6981581+08:00;True|2025-12-22T17:08:10.1973001+08:00;False|2025-12-22T17:08:00.4576327+08:00;True|2025-12-22T14:58:24.8825978+08:00;True|2025-12-22T14:54:31.0433963+08:00;True|2025-12-22T14:37:50.8363212+08:00;True|2025-12-22T14:29:14.1978041+08:00;True|2025-12-22T14:10:01.9969824+08:00;False|2025-12-22T14:09:36.1807155+08:00;True|2025-12-17T16:16:26.7825738+08:00;True|2025-12-17T16:15:16.0559691+08:00;True|2025-12-17T15:44:38.3317392+08:00;True|2025-12-17T10:19:06.7122186+08:00;False|2025-12-17T10:18:52.9280215+08:00;False|2025-12-12T09:23:50.5551285+08:00;True|2025-12-10T17:18:35.0298366+08:00;False|2025-12-10T17:18:13.1365696+08:00;True|2025-12-09T12:08:11.3908592+08:00;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>02/02/2026 15:19:47</publishTime>
+      <publishTime>02/26/2026 10:48:54</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>02/02/2026 15:19:47</publishTime>
+      <publishTime>02/26/2026 10:48:54</publishTime>
     </File>
     <File Include="Download/WMS杞欢瀹夎鍖�.apk">
       <publishTime>07/26/2025 12:50:47</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>01/30/2026 10:42:06</publishTime>
+      <publishTime>02/26/2026 10:26:19</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig2.js">
       <publishTime>09/26/2025 09:45:44</publishTime>
@@ -1676,7 +1676,7 @@
       <publishTime>05/23/2025 09:19:17</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html">
-      <publishTime>10/13/2025 14:38:37</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList_JIT.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -1705,7 +1705,7 @@
       <publishTime>05/23/2025 09:19:17</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/saomazutuo_xiaowei.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -2356,7 +2356,7 @@
       <publishTime>08/08/2025 12:48:22</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/home/console_Mobile_KaiBeiNaiTe.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -2412,10 +2412,10 @@
       <publishTime>08/08/2025 12:50:28</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/index_mobile_JiaNanAutoLogin.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
@@ -2433,7 +2433,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
-      <publishTime>01/26/2026 18:20:11</publishTime>
+      <publishTime>02/25/2026 15:50:00</publishTime>
     </File>
     <File Include="views/IpadStepIndex.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -2481,7 +2481,7 @@
       <publishTime>09/05/2025 16:05:26</publishTime>
     </File>
     <File Include="views/PublicPage/MaterialInfo.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/PublicPage/MouldDotCheckRuleInterList.html">
       <publishTime>05/23/2025 09:19:17</publishTime>
@@ -2872,6 +2872,12 @@
     <File Include="views/WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
+    <File Include="views/WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBill_CheckList_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBackBill_Check_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
     <File Include="views/WMS鎵爜妯″潡/濮斿棰嗘枡/Kf_EntrustOutBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
@@ -2967,6 +2973,12 @@
     </File>
     <File Include="views/WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBackBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBackBill_CheckList_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBackBill_Check_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/鐢熶骇鍏ュ簱/Kf_ProductInBillList_PDA.html">
       <publishTime>08/19/2025 16:01:16</publishTime>
@@ -3109,6 +3121,12 @@
     <File Include="views/WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
+    <File Include="views/WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBill_CheckList_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBill_Check_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
     <File Include="views/WMS鎵爜妯″潡/閲囪喘鍏ュ簱/Kf_POStockInBackBill_PDA.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
@@ -3129,6 +3147,12 @@
     </File>
     <File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBillList_PDA.html">
       <publishTime>08/07/2025 13:26:41</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBill_CheckList_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBill_Check_PDA.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/WMS鎵爜妯″潡/閿�鍞嚭搴�/Kf_SellOutBackBill_PDA.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -3344,7 +3368,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:50:00</publishTime>
     </File>
     <File Include="views/浠撳瓨绠＄悊/缁勬墭鍗�/Sc_PackUnionBillMain_Setto.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -3423,11 +3447,17 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ConkType.html">
       <publishTime>06/09/2025 12:01:41</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostCenter.html">
+      <publishTime>01/22/2026 19:25:57</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItem.html">
+      <publishTime>01/22/2026 19:25:57</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemAverageType.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CostItemFixRate.html">
-      <publishTime>01/30/2026 10:40:19</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3469,7 +3499,7 @@
       <publishTime>10/24/2025 11:53:31</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
-      <publishTime>07/16/2025 09:35:44</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3676,10 +3706,16 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html">
-      <publishTime>06/09/2025 12:01:41</publishTime>
+      <publishTime>02/25/2026 15:50:00</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostCenter.html">
+      <publishTime>01/22/2026 19:25:57</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.html">
+      <publishTime>01/22/2026 19:25:57</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItemAverageType.html">
       <publishTime>01/30/2026 10:40:19</publishTime>
@@ -3812,7 +3848,7 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
-      <publishTime>07/16/2025 09:17:02</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType_Excel.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -3930,7 +3966,7 @@
       <publishTime>06/13/2025 14:06:40</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameter_Add_Edit_.html">
-      <publishTime>06/13/2025 14:06:40</publishTime>
+      <publishTime>02/26/2026 10:48:31</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechParamByProc.html">
       <publishTime>05/23/2025 09:19:18</publishTime>
@@ -4650,7 +4686,10 @@
       <publishTime>05/23/2025 09:19:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鎴愭湰鍩虹璧勬枡/Add_Edit_Gy_CostAverageType.html">
-      <publishTime>01/26/2026 09:52:09</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鎴愭湰鍩虹璧勬枡/CB_Wip_excelImport.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鎴愭湰鍩虹璧勬枡/Gy_CostAverageTypeList.html">
       <publishTime>01/26/2026 09:52:09</publishTime>
@@ -5166,8 +5205,23 @@
     <File Include="views/搴旀敹绠＄悊/鎶ヨ〃鍒嗘瀽/YS_CusShouldIncomeReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
+    <File Include="views/鎴愭湰绠＄悊/鎴愭湰璐圭敤鍗�/CB_ItemMoneyBillEdit.html">
+      <publishTime>02/26/2026 08:50:05</publishTime>
+    </File>
+    <File Include="views/鎴愭湰绠＄悊/鎴愭湰璐圭敤鍗�/CB_ItemMoneyBillList.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/鎴愭湰绠＄悊/璐圭敤鍗曞紩鍏�/CB_CostAccounting.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
+    </File>
+    <File Include="views/鎴愭湰绠＄悊/璐圭敤鍗曞紩鍏�/CB_CostProjectImport.html">
+      <publishTime>02/03/2026 12:13:36</publishTime>
+    </File>
     <File Include="views/鎴愭湰绠＄悊/璐圭敤鍗曞紩鍏�/CB_ItemMoneyBillImport.html">
       <publishTime>01/30/2026 10:40:19</publishTime>
+    </File>
+    <File Include="views/鎴愭湰绠＄悊/璐圭敤鍗曞紩鍏�/CB_ItemMoneyBill_Excel.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/鏉＄爜鏄庣粏/Kf_BarCodeDetailQuery.html">
       <publishTime>11/25/2025 15:02:35</publishTime>
@@ -5206,7 +5260,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldUpperBillEdit.html">
-      <publishTime>07/16/2025 19:34:56</publishTime>
+      <publishTime>02/25/2026 16:18:43</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/涓婃ā鍗�/Sc_MouldUpperBillEdit_PDA.html">
       <publishTime>07/02/2025 11:41:30</publishTime>
@@ -5299,7 +5353,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5308,7 +5362,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍑哄簱鍗�/Sc_MouldOtherOutBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍑哄簱鍗�/Sc_MouldOtherOutBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5329,7 +5383,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5338,7 +5392,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5347,7 +5401,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5356,7 +5410,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5386,7 +5440,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5395,7 +5449,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5407,13 +5461,13 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿璋冩嫧/Sc_MouldProdMoveBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBillList_PDA.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html">
-      <publishTime>05/23/2025 09:19:19</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA_old.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -5605,10 +5659,10 @@
       <publishTime>07/19/2021 10:10:46</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
-      <publishTime>01/25/2026 16:47:14</publishTime>
+      <publishTime>02/03/2026 12:13:36</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
-      <publishTime>01/27/2026 22:09:41</publishTime>
+      <publishTime>02/25/2026 15:50:00</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -6071,7 +6125,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_ProductReportStepBillList_Web.html">
-      <publishTime>11/05/2025 09:22:16</publishTime>
+      <publishTime>02/25/2026 15:50:01</publishTime>
     </File>
     <File Include="views/鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_Add_MESStopStepWorkBillList.html">
       <publishTime>06/10/2025 15:02:35</publishTime>
@@ -7085,7 +7139,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html">
-      <publishTime>06/27/2025 14:47:53</publishTime>
+      <publishTime>02/26/2026 09:19:08</publishTime>
     </File>
     <File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit_HistoryRecord.html">
       <publishTime>06/09/2025 12:01:42</publishTime>
@@ -7151,10 +7205,10 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipMentCollectionTechParam.html">
-      <publishTime>09/17/2025 08:59:10</publishTime>
+      <publishTime>02/26/2026 16:23:56</publishTime>
     </File>
     <File Include="views/璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipMentCollectionTechParam_Temp.html">
-      <publishTime>09/17/2025 08:58:38</publishTime>
+      <publishTime>02/26/2026 16:21:04</publishTime>
     </File>
     <File Include="views/璁惧绠＄悊/璁惧鎶ヨ〃/Sb_EquipmentLoadReport.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7259,7 +7313,7 @@
       <publishTime>12/10/2025 16:58:25</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
-      <publishTime>12/10/2025 16:58:25</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7337,7 +7391,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
-      <publishTime>12/10/2025 16:58:25</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7397,7 +7451,7 @@
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">
-      <publishTime>12/10/2025 16:58:25</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -7717,7 +7771,7 @@
       <publishTime>01/15/2026 17:49:37</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_BlueToothBarCodePrint.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_batch.html">
       <publishTime>01/15/2026 17:49:37</publishTime>
@@ -7738,7 +7792,7 @@
       <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_generateSNCode.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_KeyElement.html">
       <publishTime>12/10/2025 16:58:25</publishTime>
@@ -7746,17 +7800,23 @@
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_KeyElement_Sec.html">
       <publishTime>01/15/2026 17:49:37</publishTime>
     </File>
+    <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_ShippingExport.html">
+      <publishTime>02/03/2026 12:13:36</publishTime>
+    </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_UnbindEdit.html">
       <publishTime>11/25/2025 15:02:35</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_ProcessItemStationPlatform_UnbindList.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_SachetBarCodePrint.html">
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_SaveSNByICMO.html">
       <publishTime>01/19/2026 18:32:27</publishTime>
+    </File>
+    <File Include="views/杞﹂棿绠＄悊/鍗曞搧杩囩珯_灏忓崼/Cj_zuituoxiaowei_cacheList.html">
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7868,12 +7928,12 @@
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
       <publishTime>04/25/2021 08:45:34</publishTime>
       <publishTime>04/25/2021 08:45:34</publishTime>
-      <publishTime>02/01/2026 16:38:03</publishTime>
+      <publishTime>02/04/2026 08:54:07</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
       <publishTime>04/25/2021 08:45:34</publishTime>
       <publishTime>04/25/2021 08:45:34</publishTime>
-      <publishTime>01/15/2026 17:49:37</publishTime>
+      <publishTime>02/25/2026 15:50:01</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillSubList.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -7885,7 +7945,7 @@
       <publishTime>05/23/2025 09:19:19</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html">
-      <publishTime>02/02/2026 15:19:36</publishTime>
+      <publishTime>02/25/2026 15:50:01</publishTime>
     </File>
     <File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_QiaoYi.html">
       <publishTime>05/23/2025 09:19:19</publishTime>
@@ -8926,13 +8986,13 @@
       <publishTime>05/23/2025 09:19:20</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillEdit.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鐢熶骇棰嗘枡/Kf_ProductReceiveMaterialBillList.html">
       <publishTime>10/13/2025 14:38:37</publishTime>
@@ -8987,7 +9047,7 @@
       <publishTime>08/07/2025 13:26:41</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillEdit.html">
-      <publishTime>05/23/2025 09:19:20</publishTime>
+      <publishTime>02/25/2026 15:48:19</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillList.html">
       <publishTime>09/15/2025 18:07:21</publishTime>
@@ -9201,7 +9261,7 @@
     </File>
     <File Include="Web.config">
       <publishTime>04/27/2021 20:31:08</publishTime>
-      <publishTime>02/02/2026 10:29:59</publishTime>
+      <publishTime>02/26/2026 10:48:59</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index cd93407..ed6452d 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -886,7 +886,6 @@
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairTaskReport.html" />
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipResumeCheckQuery.html" />
     <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\Sb_EquipRepairReport.html" />
-    <Content Include="views\璁惧绠＄悊\璁惧鎶ヨ〃\缂栬緫椤甸潰\Edit_Sb_EquipMentCollectionTechParam.html" />
     <Content Include="views\璁惧绠＄悊\璁惧妗ｆ\Gy_EquipFile_Excel.html" />
     <Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleEdit.html" />
     <Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 2c596da..8cd2c06 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -6,7 +6,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>D:\鏅轰簯LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
-    <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 629843e..7645aa8 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,13 +5,13 @@
     /*var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
    /*  var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆*/
-     //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
-    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+     var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
    /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //浣欐�濇澃鏈湴閰嶇疆*/
     //var WEBURL = "http://localhost:81/API/";            // 闄堥晲鍝叉湰鍦伴厤缃�*/
-     /*var WEBURL = "http://localhost: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/numinput.js b/WebTM/layuiadmin/modules/numinput.js
new file mode 100644
index 0000000..c388ae8
--- /dev/null
+++ b/WebTM/layuiadmin/modules/numinput.js
@@ -0,0 +1,367 @@
+/**
+ * Layui 鏁板瓧杈撳叆缁勪欢
+ * 
+ * @author  iTanken
+ * @since   2019-03-29
+ * @version 2020-01-19锛氭暟瀛楅敭鐩樼旱鍚戝畾浣嶈嚜閫傚簲
+ * @version 2020-04-02锛氭坊鍔犲姛鑳芥寜閽偓娴彁绀哄紑鍏冲弬鏁帮紱娣诲姞鎮诞鎻愮ず鍐呴儴閿洏鎸夐挳鏍峰紡锛涗慨澶� number 绫诲瀷杈撳叆妗嗗皬鏁拌緭鍏ラ棶棰�
+ */
+layui.define(['jquery'], function(exports) {
+  var $ = layui.$, baseClassName = 'layui-input-number', keyClassName = 'layui-keyboard-number',
+    style = ['<style type="text/css">',
+      '.', baseClassName, ' + .', keyClassName, ' { position: absolute; display: block; ', 
+      ' background-color: #f2f2f2; border-radius: 2px; border: 1px solid #e6e6e6; outline: none; }', 
+      '.', keyClassName, ' .layui-key-btn { font-family: Consolas; font-size: 17px; font-weight: 600; ',
+      ' text-align: center; background-color: #ffffff; cursor: pointer; overflow: hidden; padding: 10px; }',
+      '.', keyClassName, ' .layui-key-btn:active { background-color: #f2f2f2; }',
+      '.layui-layer-tips kbd { display: inline-block; padding: 3px 5px; font-size: 11px;',
+      ' line-height: 10px; color: #24292e; vertical-align: middle; background-color: #fafbfc;',
+      ' border: 1px solid #d1d5da; border-radius: 3px; box-shadow: inset 0 -1px 0 #d1d5da; }',
+      '</style>'].join('');
+  $('head link:last')[0] && $('head link:last').after(style) || $('head').append(style);
+
+  var numberInput = {
+    /** 榛樿閰嶇疆閫夐」 */
+    options: {
+      // 123锛�123閿疆椤�, 789锛�789閿疆椤�
+      topBtns: 123,
+      // 鍙充晶鍔熻兘鎸夐挳
+      rightBtns: true,
+      // 鍔熻兘鎸夐挳鎻愮ず
+      showTips: true,
+      // 鐩戝惉閿洏浜嬩欢
+      listening: true,
+      // 鎵归噺閰嶇疆榛樿灏忔暟绮剧‘搴︼紝-1 涓嶅鐞嗙簿纭害
+      defaultPrec: -1,
+      // 鍒濆鍖栧洖璋冿紝鏃犲弬
+      initEnd: $.noop,
+      // 瑙﹀彂鏄剧ず鍥炶皟锛屽弬鏁颁负褰撳墠杈撳叆妗嗗拰鏁板瓧閿洏鐨� jQuery 瀵硅薄
+      showEnd: $.noop,
+      // 闅愯棌閿洏鍥炶皟锛屽弬鏁颁负褰撳墠杈撳叆妗嗙殑 jQuery 瀵硅薄
+      hideEnd: $.noop,
+      // z-index
+      zIndex: 19999999
+    },
+    /** 鍒濆鍖� */
+    init: function(custom) {
+      var _this = this;
+      _this.options = $.extend(_this.options, custom);
+      $('.' + baseClassName).attr({
+        "readonly": "readonly"
+      }).on('focus', function(e) {
+        _this.showKeyboard(_this, $(this));
+      });
+      typeof _this.options.initEnd === 'function' && _this.options.initEnd();
+    },
+    /** 鑾峰彇鎸夐敭鎮诞鎻愮ず */
+    getTips: function(tip) {
+      return this.options.showTips ? (' lay-tips="' + tip + '"') : '';
+    },
+    /** 鏄剧ず鏁板瓧閿洏 */
+    showKeyboard: function(_this, $input) {
+      // 2020-04-02锛氫慨澶嶅皬鏁拌緭鍏ラ棶棰橈紝灏� number 绫诲瀷杈撳叆妗嗕竴寰嬭缃负 text
+      $input.prop('type') === 'number' && $input.attr('type', 'text');
+      var $keyBoard = $input.next('.' + keyClassName);
+      if (!$keyBoard[0]) {
+        // 涓嶅瓨鍦紝娣诲姞鍏冪礌
+        var sizeXS = _this.options.rightBtns ? 'xs3' : 'xs4',
+          sizeZero = _this.options.rightBtns ? 'xs6' : 'xs4',
+          // 鎸夐挳 123
+          btn123 = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="49 97">1</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="50 98">2</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="51 99">3</div>',
+              '</div>',
+            '</div>'
+          ].join(''),
+          // 鎸夐挳 789
+          btn789 = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="55 103">7</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="56 104">8</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="57 105">9</div>',
+              '</div>',
+            '</div>'
+          ].join(''),
+          /* 閫�鏍奸敭 */
+          backspace = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="8">',
+                  '<i class="layui-icon layui-icon-return"', _this.getTips('閫�鏍� <kbd>Backspace</kbd>'), '></i>',
+                '</div>',
+              '</div>',
+            '</div>'
+          ].join(''),
+          /* 澧炲姞閿� */
+          add = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="38 39">',
+                  '<i class="layui-icon layui-icon-up"', _this.getTips('澧炲姞 <kbd>鈫�</kbd>'), '></i>',
+                '</div>',
+              '</div>',
+            '</div>'
+          ].join(''),
+          /* 鍑忓皬閿� */
+          reduce = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="37 40">',
+                  '<i class="layui-icon layui-icon-down"', _this.getTips('鍑忓皬 <kbd>鈫�</kbd>'), '></i>',
+                '</div>',
+              '</div>',
+            '</div>'
+          ].join(''),
+          /* 娓呯┖閿� */
+          reset = [
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="46">',
+                  '<i class="layui-icon layui-icon-refresh-1"', _this.getTips('娓呯┖ <kbd>Delete</kbd>'), '></i>',
+                '</div>',
+              '</div>',
+            '</div>'
+          ].join('');
+
+        $input.after(['<div tabindex="0" hidefocus="true" class="', keyClassName, 
+          ' layui-unselect layui-anim layui-anim-upbit" ', 
+          'style="width:', $input.width() + 10, 'px;">',
+          '<div class="layui-row layui-col-space1">',
+            _this.options.topBtns == 789 ? btn789 : btn123,
+            _this.options.rightBtns ? backspace : '',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="52 100">4</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="53 101">5</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="54 102">6</div>',
+              '</div>',
+            '</div>',
+            _this.options.rightBtns ? add : '',
+            _this.options.topBtns == 789 ? btn123 : btn789,
+            _this.options.rightBtns ? reduce : '',
+            _this.options.rightBtns ? '' : backspace,
+            '<div class="layui-col-', sizeZero, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="48 96">0</div>',
+              '</div>',
+            '</div>',
+            '<div class="layui-col-', sizeXS, '">',
+              '<div class="layui-card">',
+                '<div class="layui-key-btn" data-keycode="110 190">.</div>',
+              '</div>',
+            '</div>',
+            _this.options.rightBtns ? reset : '',
+          '</div>',
+        '</div>'].join(''));
+
+        $keyBoard = $input.next('.' + keyClassName);
+
+        $keyBoard.on('touchstart click', '.layui-key-btn', function(e) {
+          _this.setValue(_this, $input, $(this));
+          layui.stope(e);
+          return false;
+        });
+        $keyBoard.on('blur', function(e) {
+          _this.setValueRange(_this, $input, _this.toFixedPrec(_this, $input));
+          $keyBoard.remove(); // $keyBoard.hide();
+          typeof _this.options.hideEnd === 'function' && _this.options.hideEnd($input);
+        });
+        _this.options.listening && _this.initKeyListening(_this, $input, $keyBoard);
+      }
+
+      _this.display(_this, $input, $keyBoard);
+    },
+    /** 璁剧疆鏁板瓧閿洏鏍峰紡骞舵樉绀� */
+    display: function(_this, $input, $keyBoard) {
+      var showTop = $input[0].offsetTop + $input[0].offsetHeight + 4, boardHeight = $keyBoard.height(),
+        $win = $(window), topOffset = $keyBoard.offset().top + $keyBoard.outerHeight() + 4 - $win.scrollTop();
+
+      // 鏁板瓧閿洏绾靛悜瀹氫綅鑷�傚簲
+      if (topOffset + boardHeight > $win.height() && topOffset >= boardHeight) {
+        showTop = $input[0].offsetTop - boardHeight - 5;
+      }
+
+      $keyBoard.css({
+        'top': showTop + 'px', 
+        'left': $input[0].offsetLeft + 'px',
+        'z-index': _this.options.zIndex
+      });
+
+      $keyBoard.show(200, function() {
+        typeof _this.options.showEnd === 'function' && _this.options.showEnd($input, $keyBoard);
+      }).focus();
+    },
+    /** 鍒濆鍖栭敭鐩樼洃鍚簨浠� */
+    initKeyListening: function(_this, $input, $keyBoard) {
+      var $key, code;
+      $keyBoard.on('keydown', function(e) {
+        code = e.keyCode;
+        var inputNumber = parseInt($input.val(), 10) || 0;
+        if (code === 107 || e.shiftKey && code === 187) {
+          // 鍔犲彿鍒囨崲姝ｆ暟
+          inputNumber < 0 && _this.setValueRange(_this, $input, Math.abs(inputNumber));
+        } else if (code === 109 || e.shiftKey && code === 189) {
+          // 鍑忓彿鍒囨崲璐熸暟
+          inputNumber > 0 && _this.setValueRange(_this, $input, '-' + inputNumber);
+        } else {
+          // 鐩戝惉鏁板瓧閿洏锛岄��鏍奸敭(Backspace)/閲嶇疆閿�(Delete)
+          $key = $keyBoard.find('.layui-key-btn[data-keycode~=' + code + ']');
+          if ($key[0]) {
+            $key.trigger('click').css("background-color", "#f2f2f2");
+            $keyBoard.off('keyup').on('keyup', function(e) {
+              $('.layui-key-btn[data-keycode]').css("background-color", "#ffffff");
+            });
+          }
+          if (code > 36 && code < 41) {
+            // 涓婁笅宸﹀彸閿紝闃叉瑙﹀彂娣峰姩鏉℃粦鍔ㄤ簨浠�
+            return false;
+          }
+        }
+        return true;
+      });
+    },
+    /** 澶勭悊绮剧‘搴� */
+    toFixedPrec: function(_this, $input, val1, val2) {
+      var m, s, rs, prec = $.trim($input.data('prec'));
+      // 2020-04-02锛氫慨澶嶈幏鍙栧皬鏁扮簿纭害閰嶇疆鍊奸棶棰�
+      prec = parseInt(prec === '' || isNaN(prec) ? _this.options.defaultPrec : prec, 10);
+
+      val1 = val1 === undefined ? $input.val() : val1;
+      val1 = val1 == '' ? ($input.attr('min') || 0) : val1;
+      rs = val1.toString().split('.')[1];
+      if (prec < 0) {
+        prec = rs && rs.length || prec;
+      }
+
+      val2 = val2 || 0;
+      rs = val2.toString().split('.')[1];
+      prec = Math.max(prec, rs ? rs.length : 0);
+
+      m = Math.pow(10, prec);
+      s = ((val1 * m + val2 * m).toFixed(0) / m).toString();
+      rs = s.indexOf('.');
+      if (rs < 0 && prec > 0) {
+        rs = s.length;
+        s += '.';
+      }
+      while (s.length <= rs + prec) {
+        s += '0';
+      }
+      return s;
+    },
+    /** 璁剧疆鍊艰寖鍥� */
+    setValueRange: function(_this, $input, value) {
+      var minVal = $input.attr('min') || Math.pow(-2, 63), 
+        maxVal = $input.attr('max') || Math.pow(2, 63) - 1;
+
+      minVal = typeof minVal === 'string' && minVal.indexOf('.') > -1 ? parseFloat(minVal) : parseInt(minVal, 10);
+      maxVal = typeof maxVal === 'string' && maxVal.indexOf('.') > -1 ? parseFloat(maxVal) : parseInt(maxVal, 10);
+
+      if (value < minVal) {
+        value = _this.toFixedPrec(_this, $input, minVal);
+        _this.tips($input, '鏈�灏忓�间负 <kbd>' + minVal + '</kbd>锛�');
+      }
+      if (value > maxVal) {
+        value = _this.toFixedPrec(_this, $input, maxVal);
+        _this.tips($input, '鏈�澶у�间负 <kbd>' + maxVal + '</kbd>锛�');
+      }
+      value = value < minVal ? minVal : (value > maxVal ? maxVal : value);
+
+      $input.val(value);
+    },
+    /** 璁剧疆杈撳叆妗嗗�� */
+    setValue: function(_this, $input, $key) {
+      var inputVal = $.trim($input.val()), keyVal = $.trim($key.text()), changeVal,
+        prec = $.trim($input.data('prec')), isDecimal = inputVal.indexOf('.') > -1;
+        // 2020-04-02锛氫慨澶嶈幏鍙栧皬鏁扮簿纭害閰嶇疆鍊奸棶棰�
+        prec = parseInt(prec === '' || isNaN(prec) ? _this.options.defaultPrec : prec, 10);
+
+      if ($.inArray(keyVal, ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.']) > -1) {
+        if (keyVal === '.') {
+          if (inputVal === '' || isDecimal) {
+            return;
+          }
+          if (prec === 0) {
+            _this.tips($input, '褰撳墠瀛楁涓嶅厑璁歌緭鍏ュ皬鏁帮紒'); 
+            return;
+          }
+        }
+        if (keyVal === '0' && inputVal.indexOf('0') === 0 && !isDecimal) {
+          return;
+        }
+        if (inputVal.indexOf('.') > -1 && inputVal.split('.')[1].length >= prec && prec > 0) {
+          _this.tips($input, '绮剧‘搴︿负淇濈暀灏忔暟鐐瑰悗 <kbd>' + prec + '</kbd> 浣嶏紒');
+          return;
+        }
+
+        changeVal = inputVal = (keyVal !== '.' && inputVal === '0' ? '' : inputVal) + keyVal;
+        $input.val(inputVal);
+      } else {
+        changeVal = inputVal === '' ? 0 : inputVal,
+          step = $input.attr('step');
+        if (isDecimal) {
+          step = parseFloat(step) || 0.1;
+          changeVal = parseFloat(changeVal);
+        } else {
+          step = parseInt(step, 10) || 1;
+          changeVal = parseInt(changeVal, 10);
+        }
+        // right function buttons
+        switch($key.data('keycode')) {
+        case '38 39':
+          // 鈫戙�佲啋 閿鍔�
+          changeVal = _this.toFixedPrec(_this, $input, changeVal, step);
+          break;
+        case '37 40':
+          // 鈫撱�佲啇 閿噺灏�
+          changeVal = _this.toFixedPrec(_this, $input, changeVal, -step);
+          break;
+        case 8:
+          // Backspace 閿��鏍�
+          var valLength = inputVal.length;
+          valLength && $input.val(inputVal.substring(0, valLength - 1));
+          return;
+        case 46:
+          // Delete 閿竻绌�
+          $input.val('');
+          return;
+        }
+      }
+      $input.val(changeVal);
+    },
+    /** 鎻愮ず */
+    tips: function($input, msg) {
+      return layer.tips(msg, $input, { tips: [1, '#01AAED'], time: 2e3, anim: 6, zIndex: this.options.zIndex });
+    }
+  };
+
+  exports('numinput', numberInput);
+});
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 6ea745c..1f462fd 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.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>
@@ -61,7 +62,8 @@
                 , table = layui.table
                 , form = layui.form
                 , laydate = layui.laydate
-                , element = layui.element;
+                , element = layui.element
+                ;
             //window 鍏ㄥ眬鍙橀噺
             window.mychart1 = echarts.init(document.getElementById('mychart1'));
             window.mychart2 = echarts.init(document.getElementById('mychart2'));
@@ -85,11 +87,13 @@
                 dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json  script  jsonp
                 success: function (data) {
                     var LoadData = data.data.h_p_JIT_GetSourceInfoByUser;
-
+                    // 鍗庤垷鍒嗙粍鍐呭
+                    var LoadingTabsContact = {}
                     if (LoadData.length > 0)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
                     {
                         HSBName = LoadData[0].HSourceName;
                         for (var i = 1; i <= LoadData.length + 1; i++) {
+                            // sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�"
                             if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
                                 if (i <= LoadData.length) {
                                     var html1 = '';
@@ -130,7 +134,9 @@
                                     html1 += '</dl>';
                                     html1 += '</div>';
                                     html1 += '</div>';
-                                    $("#topleft").append(html1);
+
+                                    // 浣跨敤涓嶅彲瑙佸璞℃殏瀛樻覆鏌撶殑html
+                                    $("#topleftTemp").append(html1);
                                     $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete"  onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
 
                                     //鏍规嵁杩斿洖鐨� 閫変腑鏍囧織HNowFlag璁剧疆閫変腑鐨勮祫婧�
@@ -139,19 +145,31 @@
                                         $("#ts" + i + "").addClass('check'); // 娣诲姞褰撳墠鍏冪礌鐨勬牱寮�
                                         Check(this, i);
                                     }
+                                    if (LoadData[i - 1].HSourceNumber.substring(0, 2) == 'ZS') {
+                                        var GroupName = LoadData[i - 1].HSourceNumber.substring(3, 4)
+                                        if (!LoadingTabsContact[GroupName]) {
+                                            LoadingTabsContact[GroupName] = []
+                                        }
+                                        LoadingTabsContact[GroupName].push($("#topleftTemp").html())
+                                    }
+
+                                    $("#topleftTemp").empty()
+
+
                                 }
                                 else {
-                                    var html1 = '';
-                                    html1 += '<div class="layui-col-sm12 layui-col-md2">';
-                                    html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
-                                    html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
-                                    html1 += '</div>';
-                                    html1 += '</div>';
-                                    $("#topleft").append(html1);
+                                    // var html1 = '';
+                                    // html1 += '<div class="layui-col-sm12 layui-col-md2">';
+                                    // html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+                                    // html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+                                    // html1 += '</div>';
+                                    // html1 += '</div>';
+                                    // $("#topleft").append(html1);
 
                                 }
                             } else {
                                 if (i <= LoadData.length) {
+
                                     var html1 = '';
                                     html1 += '<div class="layui-col-sm12 layui-col-md3">';
                                     html1 += '<div class="cnt ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
@@ -193,6 +211,7 @@
                                     html1 += '</dl>';
                                     html1 += '</div>';
                                     html1 += '</div>';
+
                                     $("#topleft").append(html1);
                                     $("#ts" + i + "").append('<span class="layui-icon layui-icon-delete delete"  onclick="Delete(event,this,' + i + ')"></span>'); //鍦ㄥ綋鍓峝iv鍚庤拷鍔犲姞涓�涓猻pan鍒犻櫎
 
@@ -216,6 +235,50 @@
                             }
 
                         }
+
+                        if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
+                            // 鍗庤垷 浣跨敤鍒嗙粍鏍囩
+                            var divParent = document.createElement("div")
+                            divParent.classList.add("layui-tab")
+                            divParent.classList.add("layui-tab-card")
+                            var tabTitle = document.createElement("ul")
+                            var tabContent = document.createElement("div")
+                            tabTitle.classList.add("layui-tab-title")
+                            tabContent.classList.add("layui-tab-content")
+                            var index = 0
+                            for (var key in LoadingTabsContact) {
+                                var liItem = document.createElement("li")
+                                liItem.innerText = key
+                                var tabItem = document.createElement("div")
+                                tabItem.classList.add("layui-tab-item")
+                                tabItem.classList.add("layui-row")
+                                tabItem.classList.add("layui-col-space10")
+
+                                if (index == 0) {
+                                    liItem.classList.add("layui-this")
+                                    tabItem.classList.add("layui-show")
+                                }
+
+                                for (var j = 0; j < LoadingTabsContact[key].length; j++) {
+                                    tabItem.innerHTML += LoadingTabsContact[key][j]
+                                }
+                                tabTitle.appendChild(liItem)
+                                tabContent.appendChild(tabItem)
+                                var html1 = '';
+                                html1 += '<div class="layui-col-sm12 layui-col-md2">';
+                                html1 += '<div class="cnt1 ctop" id="ts' + i + '" onclick="Check(this,' + i + ')">';
+                                html1 += '<span class="layui-icon layui-icon-addition imgicon0" onclick="Add(event,this,' + i + ')"></span>';
+                                html1 += '</div>';
+                                html1 += '</div>';
+                                tabItem.innerHTML += html1;
+                                index++
+                            }
+                            divParent.appendChild(tabTitle)
+                            divParent.appendChild(tabContent)
+
+                            $("#topleft").append(divParent)
+                        }
+
                     }
                     else {
                         var html1 = '';
@@ -897,6 +960,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
                 content: '鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
@@ -938,6 +1002,7 @@
                 , id: 'LAY_layuipro' //璁惧畾涓�涓猧d锛岄槻姝㈤噸澶嶅脊鍑�
                 , btn: ['纭畾', '鍙栨秷']
                 , btnAlign: 'c'
+                , scrollbar: false
                 , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
                 , content: '<div style="padding: 50px; line-height: 22px; font-weight: 300;text-align:center;">璁惧缂栧彿:' + HSourceName1 + '<br>宸ュ崟鍙�:' + workcode + '<br>浜у搧鍚嶇О:' + HMaterName + '<br></div>'
                 , btn1: function (index, layero, e) {
@@ -983,6 +1048,7 @@
                 closeBtn: 1,
                 shift: 2,
                 area: ['95%', '95%'],
+                scrollbar: false,
                 maxmin: true,
                 content: '鐢熶骇绠＄悊/浣滀笟鎸囧涔�/Gy_SOPBill_Video.html?OperationType=5&HMaterID=' + HMaterID + '&HSourceNo=' + workcode + '&HSourceEntryID=' + HSourceEntryID + '&HProcID=' + HProcID,
                 end: function () {
@@ -1071,6 +1137,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
                 content: '鐢熶骇绠＄悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
@@ -1110,6 +1177,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
                 content: '鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
@@ -1252,6 +1320,7 @@
                 title: '鏂板鍋滃伐鎭㈠鍗�',
                 closeBtn: 1,
                 shift: 2,
+                scrollbar: false,
                 area: ['100%', '100%'],
                 maxmin: true,
                 content: '鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐鎭㈠鍗�/Sc_MESStopRestoreWorkBill.html?OperationType=2&linterid=&HSouceBillType=',
@@ -1291,6 +1360,7 @@
                 , anim: 0
                 , content: ['璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HProcExchInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HICMOEntryID + '&HSourceEntryID=' + HSourceEntryID + '', 'yes']
                 , resize: false
+                , scrollbar: false
                 , cancel: function () {
                 }
                 , end: function () {
@@ -1365,6 +1435,7 @@
                 , anim: 0
                 , content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes']
                 , resize: false
+                , scrollbar: false
                 , cancel: function () {
 
                 }
@@ -1394,6 +1465,7 @@
                 , anim: 0
                 , content: ['鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID + '&HBillSubType=寰憰鍝�', 'yes']
                 , resize: false
+                , scrollbar: false
                 , cancel: function () {
 
                 }
@@ -1469,6 +1541,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
                 content: '杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_CurrentWork.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
@@ -1546,6 +1619,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
                 content: '鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/Sc_MESExecptFeedBackBillType.html',
                 end: function () {
 
@@ -1609,6 +1683,7 @@
                 closeBtn: 1,
                 shift: 2,
                 area: ['100%', '100%'],
+                scrollbar: false,
                 maxmin: true,
                 content: '璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
@@ -1699,6 +1774,8 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
+                scrollbar: false,
+
                 content: '璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html?OperationType=2',
                 end: function () {
 
@@ -1798,6 +1875,7 @@
                         <div class="layui-row layui-col-space10" id="topleft">
 
                         </div>
+                        <div style="display: none;" id="topleftTemp"> </div>
                     </div>
                 </fieldset>
             </div>
@@ -1821,7 +1899,8 @@
                     </ul>
                     <div class="layui-tab-content content3">
                         <div class="layui-tab-item layui-show">
-                            <div class="layui-row layui-col-space10" id="btomleft" style="height:600px;display:block;overflow-y:auto;">
+                            <div class="layui-row layui-col-space10" id="btomleft"
+                                style="height:600px;display:block;overflow-y:auto;">
 
                             </div>
                         </div>
@@ -2014,4 +2093,5 @@
     </div>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
index c2a3ab4..270dc47 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\347\224\237\344\272\247\345\205\245\345\272\223\345\215\225/Kf_ProductInBillList.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>
@@ -26,6 +27,7 @@
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -42,62 +44,76 @@
                                 <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 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;">
+                                        <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>
                                 <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="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes" lay-verify="HStockOrgID">
+                                        <select name="HStockOrgID" id="HStockOrgID" class="ForFilteringSchemes"
+                                            lay-verify="HStockOrgID">
                                             <!--鍔ㄦ�佹覆鏌撶粍缁�-->
                                         </select>
                                     </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" style="padding: 6px; 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 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;">
+                                            <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>
@@ -105,26 +121,33 @@
                                             </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: 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 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;">
+                                            <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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -132,7 +155,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                name="ColContent1" id="ColContent1">
                                         </div>
                                     </div>
 
@@ -140,19 +164,25 @@
                                         <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 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;">
+                                            <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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -160,7 +190,8 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -224,7 +255,7 @@
             var OperationType = params[params[0]];  //1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮�  2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
             var ViewName = params[params[1]];       //鎵�璋冪敤鐨勮鍥�
             //#endregion
-           
+
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HBillType) || document.title;
@@ -501,7 +532,7 @@
                     //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
                     case 'btn_Drop': set_DropBill(1);
                         break;
- 
+
                     //鍙嶄綔搴熸寜閽�
                     case 'btn_DeDrop': set_DropBill(2);
                         break;
@@ -559,6 +590,7 @@
                     , area: ['100%', '100%']
                     , title: HPageTitle + '- 鏂板'
                     , shift: 0  //寮瑰嚭鍔ㄧ敾
+                    , scrollbar: false
                     , content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1'
                     , btn: ['纭畾'],
                     // 鎸夐挳1 鐨勫洖璋�
@@ -581,6 +613,7 @@
                         , area: ['100%', '100%']
                         , title: HPageTitle + '- 缂栬緫'
                         , shift: 0  //寮瑰嚭鍔ㄧ敾
+                        , scrollbar: false
                         , content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1'
                         , btn: ['纭畾'],
                         // 鎸夐挳1 鐨勫洖璋�
@@ -610,6 +643,7 @@
                         , shift: 2 //寮瑰嚭鍔ㄧ敾
                         , area: ["90%", "90%"] //绐椾綋澶у皬
                         , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                        , scrollbar: false
                         , content: ['../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ICStockBillSub_WMS_List.html?BillType=' + BillType + '&InterID=' + InterID, "yes"]
                         , btn: ["纭畾", "鍙栨秷"]
                         //, end : function () {
@@ -643,6 +677,7 @@
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                         , content: '../../鍖呰鍑哄叆搴撴槑缁�/Kf_PackStockDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
                         , resize: false
+                        , scrollbar: false
                         , btn: ["纭畾", "鍙栨秷"]
                         , end: function () {
                             //鍒锋柊椤甸潰,
@@ -850,6 +885,7 @@
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: [contentUrl, "yes"]
+                    , scrollbar: false
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -953,7 +989,7 @@
                             com1 = "like'%" + ColContent1 + "'";
                             bre1ak;
                         case "9":
-                            com1  = "like'" + ColContent1 + "%'";
+                            com1 = "like'" + ColContent1 + "%'";
                             break;
                         case "10":
                             com1 = "not like'%" + ColContent1 + "%'";
@@ -974,7 +1010,7 @@
                             com2 = "like'%" + ColContent2 + "'";
                             bre1ak;
                         case "9":
-                            com2  = "like'" + ColContent2 + "%'";
+                            com2 = "like'" + ColContent2 + "%'";
                             break;
                         case "10":
                             com2 = "not like'%" + ColContent2 + "%'";
@@ -1016,7 +1052,7 @@
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                         , content: '../../楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
+                        , scrollbar: false
                         , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
                         end: function () {  //褰撳叧闂椂璋冪敤
                             get_FastQuery(table, option);
@@ -1027,7 +1063,7 @@
                     })
                 }
             });
-             //#endregion
+            //#endregion
             //#region 鍒楄〃鍒锋柊
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
@@ -1064,8 +1100,9 @@
                                     col.push({
                                         field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
                                             return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
-                                        }, style: 'cursor: pointer;' });
-                                }else {
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                } else {
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
@@ -1109,7 +1146,7 @@
                             ins = table.render(option);
                             layer.close(ajaxLoad);
                             //鑷畾涔夎繃婊や笅鎷夋鍔犺浇
-                                                       
+
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
@@ -1530,4 +1567,5 @@
     </script>
 
 </body>
-</html>
+
+</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_CostItemAverageType.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_CostItemAverageType.html"
index f412d6b..6a27ba6 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_CostItemAverageType.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_CostItemAverageType.html"
@@ -420,7 +420,9 @@
                             $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵�丠ProcName
                             $("#HAverageTypeID").val(data.鎴愭湰鍒嗛厤绫诲瀷鍐呯爜);
-                           
+                            $("#HCostItemName").val(data.鎴愭湰椤圭洰鍚嶇О);
+                            $("#HAverageTypeName").val(data.鎴愭湰鍒嗛厤绫诲瀷鍚嶇О);
+                         
                             $("#HFixRate").val(data.鏈熸湯鍦ㄥ埗绯绘暟);
                             $("#HRemark").val(data.澶囨敞);
                             $("#HProcName").val(data.瀵瑰簲鏂规硶);
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_CostItemFixRate.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_CostItemFixRate.html"
index 816170a..2c54536 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_CostItemFixRate.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_CostItemFixRate.html"
@@ -66,10 +66,15 @@
                                                         <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" autocomplete="off">
                                                     </div>
                                                 </div>
+                                               
                                                 <div class="layui-inline">
-                                                    <label class="layui-form-label" style="width: 120px">鎴愭湰椤圭洰锛�</label>
+                                                    <label class="layui-form-label">鎴愭湰椤圭洰</label>
                                                     <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HCostItemID" id="HCostItemID" autocomplete="off">
+                                                        <input type="text" name="HCostItemName" id="HCostItemName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                        <input type="hidden" name="HCostItemID" id="HCostItemID" class="layui-input" value="0" style="float:left;width:130px;">
+                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HCostItemList" 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">
@@ -232,6 +237,11 @@
             }
             //#endregion
 
+            //#region 閫夋嫨椤圭洰鎸夐挳
+            form.on('submit(HCostItemList)', function () {
+                get_checkHCostItemID();
+            });
+
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
@@ -311,6 +321,30 @@
                 $("#HFixRate ").val("0");
                 $("#HNumber").val("");
             }
+
+            //#region 椤圭洰閫夋嫨
+            function get_checkHCostItemID() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鎴愭湰椤圭洰鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCostItemName").val(checkStatus.data[0].鎴愭湰椤圭洰鍚嶇О);
+                        $("#HCostItemID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
             //缂栬緫
             function set_EditFromGrid() {
                 $("#HItemID").val(linterid);
@@ -335,11 +369,12 @@
                             $("#HUSEORGID").val(data.HUSEORGID);//浣跨敤缁勭粐
                             $("#HCREATEORGID").val(data.HCREATEORGID);//鍒涘缓缁勭粐
                             $("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
-                            $("#HCostItemID").val(data.鎴愭湰椤圭洰);//澶囨敞
-                            $("#HFixRate").val(data.鍥哄畾鍒嗛厤鐜�);//澶囨敞
-                            $("#HCountRemark ").val(data.鎴愭湰椤圭洰璁＄畻姒傝堪);//澶囨敞
-                            $("#HProcName").val(data.瀵瑰簲鏂规硶);//澶囨敞
-                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("#HCostItemID").val(data.鎴愭湰椤圭洰);
+                            $("#HCostItemName").val(data.鎴愭湰椤圭洰鍚嶇О);
+                            $("#HFixRate").val(data.鍥哄畾鍒嗛厤鐜�);
+                            $("#HCountRemark ").val(data.鎴愭湰椤圭洰璁＄畻姒傝堪);
+                            $("#HProcName").val(data.瀵瑰簲鏂规硶);
+                            $("#HRemark").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"));
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_ConkType.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_ConkType.html"
index f417336..6a40d63 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_ConkType.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_ConkType.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>
@@ -15,6 +16,7 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -31,49 +33,61 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鏁呴殰浠ｇ爜</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HNumber"
+                                            id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鏁呴殰鍚嶇О</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                        <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 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">
+                                <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" 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 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;">
+                                            <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>
@@ -81,26 +95,33 @@
                                             </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" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+                                                <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;">
+                                            <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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -108,26 +129,33 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                            <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 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;">
+                                            <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="<=">
+                                                    <=< /option>
+                                                <option value="<">
+                                                    << /option>
+                                                <option value="<>">
+                                                    <>
+                                                </option>
                                                 <option value="7">鍖呭惈</option>
                                                 <option value="8">宸﹀寘鍚�</option>
                                                 <option value="9">鍙冲寘鍚�</option>
@@ -135,14 +163,15 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                            <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" >
+                        <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="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
@@ -190,7 +219,7 @@
             var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
             var ins;                        //鐢ㄤ簬瀵煎嚭excel
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["hitemid","hparentid", "HCREATEORGID", "HUSEORGID"];
+            var titleData = ["hitemid", "hparentid", "HCREATEORGID", "HUSEORGID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -432,7 +461,7 @@
 
                             if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                 ColFilter();
-                            }                           
+                            }
                         } else {
                             layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -650,7 +679,7 @@
                         $.ajax({
                             url: GetWEBURL() + 'DeltetGy_ConkType',
                             type: "GET",
-                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"]},
+                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { icon: 1 }, function () {
@@ -706,7 +735,7 @@
                 get_Display(sWhere);
             }
             //#endregion
-         
+
             //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
             function set_CheckBill(num) {
                 var checkStatus = table.checkStatus('mainTable')
@@ -808,9 +837,19 @@
                 //鑾峰彇鍙傛暟
                 var params = getUrlVars();
                 var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡  1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+                var filterType = params[params[1]]; // 浠庡弬鏁颁腑鑾峰彇 杩囨护绫诲瀷 Module: 妯″叿绫诲瀷锛岃繃婊ゆā鍏锋晠闅滅被鍒�, Equip: 璁惧绫诲瀷, 杩囨护璁惧鏁呴殰绫诲埆
                 var addSWhere = "";
                 if (typeof (openType) != "undefined") {
                     addSWhere = " and isnull(绂佺敤浜�,'') = '' and 瀹℃牳浜� != ''";
+                }
+                if (typeof (filterType) != "undefined") {
+                    if(filterType == 'Module'){
+                        addSWhere = " and 鏁呴殰绫诲埆浠ｇ爜 like 'MJ%'";
+                    }
+                    if(filterType == 'Equip'){
+                        addSWhere = " and 鏁呴殰绫诲埆浠ｇ爜 like 'SB%'";
+
+                    }
                 }
                 return addSWhere;
             }
@@ -1083,4 +1122,5 @@
     </script>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameter_Add_Edit_.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameter_Add_Edit_.html"
index 1e9b1fd..68d52d8 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_TechnologyParameter_Add_Edit_.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_TechnologyParameter_Add_Edit_.html"
@@ -69,16 +69,6 @@
                                             </div>
                                         </div>
                                         <div class="layui-row">
-                                            <!--<div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">鍒涘缓浜�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-BT" style="width:40px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                    </button>
-                                </div>
-                            </div>-->
                                             <div class="layui-col-xs4 layui-inline">
                                                 <label class="layui-form-label" style="width: 120px">浣跨敤鐘舵�侊細</label>
                                                 <div class="layui-input-inline">
@@ -105,33 +95,23 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                        <div class="layui-row" style="margin-left: 30px">
+                                            <div class="layui-col-xs4 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="HUnitName" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HUnitID" id="HUnitID" lay-verify="HUnitID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTecUnitNumber" id="btnSearchHTecUnitNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTecUnitNumber" id="btnSearchHTecUnitNumber" style="padding: 0 10px;">
                                                         <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" lay-verify="HProNumber" name="HProNumber" id="HProNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                    <input type="hidden" name="HProjectID" id="HProjectID" lay-verify="HProjecID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProNumber" id="btnSearchHProNumber" 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">
+                                            <div class="layui-col-xs4 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="HClassName" name="HClassName" id="HClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HClassID" id="HClassID" lay-verify="HClassID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTecClassNumber" id="btnSearchHTecClassNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHTecClassNumber" id="btnSearchHTecClassNumber" style="padding: 0 10px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                     </button>
                                                 </div>
@@ -196,15 +176,28 @@
                             </div>
                         </div>
                     </div>
+                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                    <script type="text/html" id="toolbarDemo">
+                        <div class="layui-btn-container">
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_AddLine" id="btn_AddLine"><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>
+                        </div>
+                    </script>
+                    <script type="text/html" id="xuhao">
+                        {{d.LAY_TABLE_INDEX+1}}
+                    </script>
                     <input id="HItemID" name="HItemID" type="hidden" value="0" />
                     <input id="HParentID" name="HParentID" type="hidden" value="0" />
-                    <!--<input id="HUSEORGID" name="HUSEORGID" type="hidden" value="0" /> -->
                     <input id="HCREATEORGID" name="HCREATEORGID" type="hidden" value="0" />
                     <input id="HShortNumber" name="HShortNumber" type="hidden" />
                 </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>
         //鑾峰彇鍙傛暟
@@ -218,7 +211,7 @@
             }
             return vars;
         }
-
+        var OptionData = [];
         var params = getUrlVars();
         var hID = params[params[0]];//缂栬緫鏌ョ湅
         var HType = params[params[1]];    //鍗曟嵁鐘舵��
@@ -252,7 +245,7 @@
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
-            //$("#HUSEORGID").attr("disabled", true);
+            $("#HUSEORGID").attr("disabled", true);
             $("#HCREATEORGID").attr("disabled", true);
             $("#HStopflag").attr("disabled", true);
             $("#HUseFlag").attr("disabled", true);
@@ -270,17 +263,20 @@
                 var linterid = params[params[1]];//婧愬崟id
                 var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
             }
-          
+
+            //鍒濆鍖栧瓙琛�
+            set_InitGrid();
+
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
                 $("#HItemID").val(0);
-                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�             
+                $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
                 $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
                 $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
                 $("#HCREATEORGID").val(sessionStorage["OrganizationID"]);
             }
             else if (OperationType == 2) {//澶嶅埗
-                $("#HItemID").val(0);//淇敼鏃朵富琛↖D              
+                $("#HItemID").val(0);//淇敼鏃朵富琛↖D
                 //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
                 $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
@@ -313,10 +309,12 @@
             form.on('checkbox(HStopflag)', function (data) {
                 $("#HStopflag").val(data.elem.checked);
             });
+
             //閫夋嫨宸ヨ壓鎸夐挳
             form.on('submit(HEmp-BT)', function () {
                 get_checkEmp();
             });
+
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
                 set_SaveBill(data);
@@ -337,6 +335,197 @@
                 get_SearchHTecClassNumber()
             })
 
+
+            //#endregion
+
+            //#region 瀛愯〃鐩稿叧鐩戝惉
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow = {
+                    "HEquipID": "0"
+                    , "HEquipNumber": ""
+                    , "HEquipName": ""
+                    , "HTechParamAliasName": ""
+                    , "HRemark": ""
+                };
+
+                switch (obj.event) {
+                    //澧炲姞涓�琛�
+                    case 'btn_AddLine': btnAddLine(NewRow);
+                        break;                  
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn_CopyLine': btnCopyLine(data);
+                        break;                   
+                }
+            });
+            //#endregion
+
+            //#region 琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);    // 琛屽唴鍒犻櫎     
+                set_GridCellCheck(obj); // 琛屽唴蹇嵎閿瓫閫�
+            });
+             //#endregion
+
+            //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+            //#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 set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //宸ヨ壓鍙傛暟
+                        if (obj.event == "HEquipName") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "璁惧妗ｆ鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    if (checkStatus.data.length === 1) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            "HEquipID": checkStatus.data[0].hmainid,
+                                            "HEquipName": checkStatus.data[0].璁惧鍚嶇О,
+                                            "HEquipNumber": checkStatus.data[0].璁惧缂栫爜,
+                                        });
+                                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                    }
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                    if (OptionData.length > 0) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HEquipID": OptionData[0].hmainid,
+                                            "HEquipName": OptionData[0].璁惧鍚嶇О,
+                                            "HEquipNumber": OptionData[0].璁惧缂栫爜,
+                                        });
+                                        OptionData = [];
+                                    }
+                                }
+                            });
+                        }
+                        if (obj.event == "HEquipNumber") {
+                            layer.open({
+                                type: 2
+                                , skin: "layui-layer-rim"   //鍔犱笂杈规
+                                , title: "璁惧妗ｆ鍒楄〃"         //鏍囬
+                                , closeBtn: 1               //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                                , shift: 2                  //寮瑰嚭鍔ㄧ敾
+                                , area: ["90%", "90%"]      //绐椾綋澶у皬
+                                , maxmin: true              //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                                , content: ['../../璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.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('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    if (checkStatus.data.length === 1) {
+                                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                        obj.update({
+                                            "HEquipID": checkStatus.data[0].hmainid,
+                                            "HEquipName": checkStatus.data[0].璁惧鍚嶇О,
+                                            "HEquipNumber": checkStatus.data[0].璁惧缂栫爜,
+                                        });
+                                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                                    }
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                    if (OptionData.length > 0) {
+                                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                                        obj.update({
+                                            "HEquipID": OptionData[0].hmainid,
+                                            "HEquipName": OptionData[0].璁惧鍚嶇О,
+                                            "HEquipNumber": OptionData[0].璁惧缂栫爜,
+                                        });
+                                        OptionData = [];
+                                    }
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+                    }
+                })
+            }
+            //#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
+
             //#endregion
 
 
@@ -349,6 +538,41 @@
                         icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
                     }, function () { window.location.href = "../../user/login.html"; });
                 }
+            }
+            //#endregion
+
+
+            //#region 瀛愯〃鍒濆鍖�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'                   
+                    , limit: 500
+                    , height: 500
+                    , loading: false
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', title: '搴忓彿', width: 100 }
+                        , { field: 'HEquipID', title: 'HEquipID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
+                        , { field: 'HEquipNumber', title: '璁惧缂栫爜', width: 130, edit: 'text', event: "HEquipNumber" }
+                        , { field: 'HEquipName', title: '璁惧鍚嶇О', width: 130, edit: 'text', event: "HEquipName" }                 //F7
+                        , { field: 'HTechParamAliasName', title: '鏁伴噰鍚嶇О', width: 240, edit: 'text' }
+                        , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                    ]]
+                }
+
+                var rowdata = [{
+
+                    "HEquipID": "0"
+                    , "HEquipNumber": ""
+                    , "HEquipName": ""
+                    , "HTechParamAliasName": ""                  
+                    , "HRemark": ""
+                }];
+
+                option.data = rowdata;
+                table.render(option);              
             }
             //#endregion
 
@@ -365,6 +589,7 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data[0];
+                            var tableSub = result.data;
                             var IsHStopflag = data.绂佺敤鏍囪;
                             //绂佺敤鏍囪
                             if (IsHStopflag === "Y") {
@@ -372,7 +597,6 @@
                             } else {
                                 data.绂佺敤鏍囪 = "";
                             }
-                            debugger
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
                                 "HNumber": data.宸ヨ壓鍙傛暟浠ｇ爜
                                 , "HItemID": OperationType == 2 ? 0 : data.HItemID
@@ -401,6 +625,18 @@
                                     $('#set_CheckBill').removeClass('layui-btn-disabled').attr('disabled', false)
                                 }
                             }
+
+                            var rowdata = [];
+                            for (var i = 0; i < tableSub.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HEquipID": tableSub[i].HEquipID, "HEquipNumber": tableSub[i].璁惧缂栫爜, "HEquipName": tableSub[i].璁惧鍚嶇О,
+                                        "HTechParamAliasName": tableSub[i].鏁伴噰鍒悕, "HRemark": tableSub[i].澶囨敞
+                                    }
+                                )
+                            }
+                            option.data = rowdata;
+                            table.render(option);
 
                             $("#HUSEORGID").val(data.HUSEORGID)
                             layer.close(ajaxLoad);
@@ -443,7 +679,6 @@
             //#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;
@@ -451,12 +686,27 @@
                 if (!$("#HName").val()) {
                     layer.msg("璇疯緭鍏ュ伐鑹哄悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
-                }               
+                }
+                //鑾峰彇瀛愯〃鏁版嵁
+                var num = [];
+                for (var i = 0; i < table.cache["mainTable"].length; i++) {
+                    if (table.cache["mainTable"][i] != "") {
+                        table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+                        num.push(table.cache["mainTable"][i])
+                    }
+                }
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //瀛愯〃鏁版嵁搴忓垪鍖�
+                var sSubStr = JSON.stringify(num);
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Gy_TechnologyParameter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
-                    data: { "oMain": sMainStr + ';' + sessionStorage["HUserName"] },
+                    data: { "oMain": sMainSub},
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -474,7 +724,7 @@
                     }
                 });
             }
-            //#endregion     
+            //#endregion
 
             // 鑾峰彇宸ヨ壓鍙傛暟鍗曚綅 鏂规硶
             function get_HTecUnitNumber() {
@@ -569,23 +819,25 @@
                     }
                 });
             }
-            //#endregion 
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
         //#region 鍥炶皟鍑芥暟
         function GetTechnologyParameterUnitListValue(obj) {
-            debugger
             $('#HUnitID').val(obj.HItemID)
             $('#HUnitName').val(obj['宸ヨ壓鍙傛暟鍗曚綅鍚嶇О'])
         }
 
         function GetParameterTypeListValue(obj) {
-            debugger
             $("#HClassID").val(obj[0].HItemID)
             $("#HClassName").val(obj[0]['宸ヨ壓鍙傛暟鍒嗙被鍚嶇О'])
         }
+        function GetEquipFileValue(obj)  //杩斿洖璁惧
+        {
+            OptionData = obj;
+        }
         //#endregion
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
index 08e4533..d16d635 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CostAverageType.html"
@@ -37,11 +37,15 @@
                     <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>
+                                    lay-submit="" lay-filter="set_SaveBill">
+                                淇濆瓨
+                            </button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
-                                lay-filter="Cancel">閫�鍑�</button>
+                                    lay-filter="Cancel">
+                                閫�鍑�
+                            </button>
                             <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
-                                lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>-->
+                lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>-->
                         </div>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
@@ -54,17 +58,19 @@
                                 <div class="layui-tab-item layui-show">
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鎴愭湰鍒嗛厤绫诲瀷浠ｇ爜<span
-                                                    style="color: red;">*</span></label>
+                                            <label class="layui-form-label">
+                                                鎴愭湰鍒嗛厤绫诲瀷浠ｇ爜<span style="color: red;">*</span>
+                                            </label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HNumber" lay-verify="HNumber"
-                                                    id="HNumber" autocomplete="off">
+                                                       id="HNumber" autocomplete="off">
                                                 <input id="HItemID" name="HItemID" type="hidden" />
                                             </div>
                                         </div>
                                         <div class="layui-col-xs4 layui-inline">
-                                            <label class="layui-form-label">鎴愭湰鍒嗛厤绫诲瀷鍚嶇О<span
-                                                    style="color: red;">*</span></label>
+                                            <label class="layui-form-label">
+                                                鎴愭湰鍒嗛厤绫诲瀷鍚嶇О<span style="color: red;">*</span>
+                                            </label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HName" id="HName" autocomplete="off">
                                             </div>
@@ -73,7 +79,7 @@
                                             <label class="layui-form-label">鐭唬鐮�</label>
                                             <div class="layui-input-inline">
                                                 <input class="layui-input" name="HShortNumber" id="HShortNumber"
-                                                    autocomplete="off">
+                                                       autocomplete="off">
                                             </div>
                                         </div>
 
@@ -93,10 +99,10 @@
                                                        autocomplete="off">
                                             </div>
                                         </div>
-                                        
+
 
                                     </div>
-                                    
+
                                     <div class="layui-row">
                                         <div class="layui-col-xs4 layui-inline">
                                             <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
@@ -133,21 +139,21 @@
                                             <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>
+                                                       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>
+                                                       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>
+                                                       style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -156,21 +162,21 @@
                                             <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>
+                                                       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>
+                                                       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>
+                                                       style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -179,7 +185,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="HModifyEmp" id="HModifyEmp"
-                                                    style="background-color:#efefef4d;" readonly>
+                                                       style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -188,11 +194,29 @@
                                             <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
                                                 <input type="text" class="layui-input" name="HModifyTime"
-                                                    id="HModifyTime" style="background-color:#efefef4d;" readonly>
+                                                       id="HModifyTime" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
+                            </div>
+                        </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>
+                        </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>
+                                        <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>
                     </div>
@@ -225,7 +249,8 @@
                 ;
             //#endregion
 
-
+            //妯″潡鍚�
+            var HModName = "Gy_CostAverageType";
             //#region 杩涘叆椤甸潰鍗冲姞杞�
             Organ();
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
@@ -249,6 +274,7 @@
                 $("#HUseFlag").attr("disabled", true);
                 $("#HMakeEmp").val(sessionStorage["HUserName"]);; //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭鍒涘缓浜�
                 $("#HMakeTime").val(Format(new Date(), "yyyy-MM-dd"));
+                get_InitGrid();
             }
             else if (OperationType == 2) {//澶嶅埗
 
@@ -269,6 +295,7 @@
 
             }
             else if (OperationType == 3) {//缂栬緫
+                get_InitGrid();
                 //绂佺敤缁勭粐閫夐」
                 $("#HUSEORGID").attr("disabled", true);
                 $("#HCREATEORGID").attr("disabled", true);
@@ -397,7 +424,24 @@
                                 "HModifyEmp": data.淇敼浜�,
                                 "HModifyTime": data.淇敼鏃堕棿 ? util.toDateString(data.淇敼鏃堕棿, 'yyyy-MM-dd') : ""
                             });
-
+                            // 2. 鍔犺浇瀛愯〃鏁版嵁
+                            var rowdata = [];
+                            if (data && result.data.length > 0) {
+                                for (var i = 0; i < result.data.length; i++) {
+                                    var row = result.data[i];
+                                    rowdata.push({
+                                        "HMaterTypeID": row["HMaterTypeID"] || 0,
+                                        "HMaterType": row["HName"] || "",
+                                        "HWeight": row["鏉冮噸"] || 0,
+                                        
+                                    });
+                                }
+                            } else {
+                                console.log("娌℃湁瀛愯〃鏁版嵁");
+                            }
+                            // 3. 閲嶆柊娓叉煋琛ㄦ牸
+                            option.data = rowdata;
+                            table.render(option);
                             layer.close(ajaxLoad);
                         } else {
                             layer.close(ajaxLoad);
@@ -451,9 +495,15 @@
                     layer.msg("璇疯緭鍏ユ垚鏈垎閰嶇被鍨嬪悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-
-
-                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                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 sSubStr = JSON.stringify(num);
+                var sMainStr = JSON.stringify(data.field) + ";" + sSubStr + ";"+sessionStorage["HUserName"];
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Gy_CostAverageType/SaveGy_CostAverageType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -489,9 +539,258 @@
 
             //#endregion
 
+            //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow =
+                {
+                    "HWeight": "0"
+                    , "HMaterTypeID": "0"
+                    , "HMaterType": ""
+                   
+
+                };
+                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++) {
+                            $('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").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++) {
+                                $('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").attr("selected", true);
+
+                            }
+                            form.render('select');
+                        }
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 瀛愯〃鍒濆鍖�
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , limit: 100
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterTypeID', title: 'HMaterTypeID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterType', title: '鐗╂枡鍒嗙被', edit: 'text', event: "HMaterTypeList", style: 'background-color: #f9f9f9;' }
+
+                        , { field: 'HWeight', title: '鏉冮噸', edit: 'text', style: 'background-color: #f9f9f9;' }
+
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HMaterTypeID": "0"
+                        , "HMaterType": ""
+                        , "HWeight": "0"
+                       
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+              //  DisPlay_HideColumn();
+            }
+            //#endregion
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //#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) {
+                        //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++) {
+                        //    //鍙戠エ绫诲瀷
+                        //    $('#HTransType' + (i + 1)).find("option[value='" + oldData[i].HTransType + "']").attr("selected", true);
+                        //}
+                        //form.render('select');
+                        layer.close(index);
+                        /*}*/
+                    });
+                }
+            }
+            //#endregion
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+            function set_GridCellCheck(obj) {
+                window.tableEditObj = obj;
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+
+                        if (obj.event == "HMaterTypeList") {
+                            //CusType = 2;
+                            // 鏂板锛氬皢缂栬緫瀵硅薄obj璧嬪�肩粰鍏ㄥ眬鍙橀噺锛屼緵GetProjectMoneyValue浣跨敤
+                            //tableEditObj = obj;
+                            // 鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣擄紙鍘熸湁浠ｇ爜涓嶅彉锛�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim',
+                                area: ['90%', '90%'],
+                                title: '椤圭洰璐圭敤鍒楄〃',
+                                shift: 2,
+                                content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //OptionData = checkStatus.data[0];
+                                    obj.update({
+                                        "HMaterTypeID": checkStatus.data[0].HItemID
+                                        , "HMaterType": checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HBeginAddr": OptionData.HItemID
+                                    //    , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+                        // 娓呯┖浜嬩欢鏍囪瘑锛岄伩鍏嶉噸澶嶈Е鍙�
+                        obj.event = "";
+                        // 闃绘浜嬩欢鍐掓场鍜岄粯璁よ涓�
+                        e.preventDefault();
+                        e.stopPropagation();
+                        return false;
+                    }
+                });
+            }
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
+        ////鏄剧ず鍒楁暟鎹�
+        //function DisPlay_HideColumn() {
+        //    $.ajax({
+        //        url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+        //        type: "GET",
+        //        async: false,
+        //        data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+        //        success: function (data1) {
+        //            if (data1.data.length != 0) {
 
+        //                var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+        //                var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+        //                dataCol = data1.data[0].HGridString.split(',');
+
+        //                for (var i = 0; i < option.cols[0].length - 2; i++) {
+        //                    var dataCols = dataCol[i].split('|');
+        //                    //闅愯棌鍒�
+        //                    if (dataCols[1] == 1) {
+        //                        option.cols[0][i + 1]["hide"] = true;
+        //                    }
+        //                    //璁剧疆鍐呭瀛椾綋澶у皬
+        //                    if (data1.data[0].HFontSize != 0) {
+        //                        option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+        //                    } else {
+        //                        option.cols[0][i + 1]["style"] = "font-size:100%";
+        //                    }
+        //                    //璁剧疆鍒楀
+        //                    if (dataCols[3] > 0) {
+        //                        option.cols[0][i + 1]["width"] = dataCols[3];
+        //                    }
+        //                    //鏄剧ず鍒�
+        //                    if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+        //                        option.cols[0][i + 1]["hide"] = false;
+        //                    }
+        //                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+        //                    switch (dataCols[2]) {
+        //                        case "L":
+        //                            option.cols[0][i + 1]["align"] = "left";
+        //                            break;
+        //                        case "M":
+        //                            option.cols[0][i + 1]["align"] = "center";
+        //                            break;
+        //                        case "R":
+        //                            option.cols[0][i + 1]["align"] = "right";
+        //                            break;
+        //                    }
+        //                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+        //                    if (dataCols[4] != null && dataCols[4] != "") {
+        //                        option.cols[0][i + 1]["title"] = dataCols[4];
+        //                    }
+        //                }
+        //                //鍙栨秷鍐荤粨鍒�
+        //                for (var i = 1; i < option.cols[0].length - 1; i++) {
+        //                    if (option.cols[0][i]["fixed"] != null) {
+        //                        option.cols[0][i]["fixed"] = null;
+        //                    }
+        //                    else {
+        //                        break;
+        //                    }
+        //                }
+        //                //鍐荤粨鍒�
+        //                if (data1.data[0].HFixCols != 0) {
+        //                    for (var i = 0; i < data1.data[0].HFixCols; i++) {
+        //                        if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+        //                            data1.data[0].HFixCols += 1;
+        //                        }
+        //                        option.cols[0][i + 1]["fixed"] = "left";
+        //                    }
+        //                }
+        //                table.render(option);
+        //            } else {
+        //                table.render(option);
+        //            }
+        //        }, error: function () {
+        //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+        //        }
+        //    })
+        //}
         function getCar(data) {
             $("#HParentID").val(data[0]["HItemID"])
             $("#HParentName").val(data[0]["HItemName"])
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
index 821d9df..c150c16 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\346\210\220\346\234\254\345\237\272\347\241\200\350\265\204\346\226\231/CB_Wip_excelImport.html"
@@ -32,6 +32,48 @@
                                 </div>
                             </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="HYear" id="HYear" lay-verify="HYear">
+                                    <option value="2023">2023骞�</option>
+                                    <option value="2024">2024骞�</option>
+                                    <option value="2025">2025骞�</option>
+                                    <option value="2026" selected="selected">2026骞�</option>
+                                    <option value="2027">2027骞�</option>
+                                    <option value="2028">2028骞�</option>
+                                    <option value="2029">2029骞�</option>
+                                    <option value="2030">2030骞�</option>
+                                    <option value="2031">2031骞�</option>
+                                    <option value="2032">2032骞�</option>
+                                    <option value="2033">2033骞�</option>
+                                    <option value="2034">2034骞�</option>
+                                    <option value="2035">2035骞�</option>
+                                    <option value="2036">2036骞�</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="HMonth" id="HMonth" lay-verify="HMonth">
+                                    <option value="1">1鏈�</option>
+                                    <option value="2">2鏈�</option>
+                                    <option value="3">3鏈�</option>
+                                    <option value="4">4鏈�</option>
+                                    <option value="5">5鏈�</option>
+                                    <option value="6">6鏈�</option>
+                                    <option value="7">7鏈�</option>
+                                    <option value="8">8鏈�</option>
+                                    <option value="9">9鏈�</option>
+                                    <option value="10">10鏈�</option>
+                                    <option value="11">11鏈�</option>
+                                    <option value="12">12鏈�</option>
+                                </select>
+
+                            </div>
+                        </div>
                     </div>
 
                     <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -133,6 +175,22 @@
         function set_ClearBill() {
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            // 鑾峰彇褰撳墠鏃ユ湡
+            var currentDate = new Date();
+            var currentYear = currentDate.getFullYear();
+            var currentMonth = currentDate.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ+1
+
+            // 璁剧疆榛樿閫変腑褰撳墠骞翠唤
+            var yearSelect = document.getElementById('HYear');
+            if (yearSelect) {
+                yearSelect.value = currentYear;
+            }
+
+            // 璁剧疆榛樿閫変腑褰撳墠鏈堜唤
+            var monthSelect = document.getElementById('HMonth');
+            if (monthSelect) {
+                monthSelect.value = currentMonth;
+            }
         }
         //#endregion
 
@@ -205,12 +263,35 @@
 
         //瀵煎叆(淇濆瓨)
         function set_AddNew(data) {
+            // 鑾峰彇閫変腑鐨勫勾浠藉拰鏈堜唤
+            var year = $("#HYear").val();
+            var month = $("#HMonth").val();
+            if (!year || !month) {
+                layer.msg("璇烽�夋嫨骞翠唤鍜屾湀浠斤紒");
+                return;
+            }
+
+            if (!option.data || option.data.length === 0) {
+                layer.msg("鏃犳暟鎹紝璇峰厛瀵煎叆鏁版嵁锛�");
+                return;
+            }
+
             var num = [];
             for (var i = 0; i < option.data.length; i++) {
                 if (option.data[i] != "") {
-                    num.push(option.data[i])
+                    var item = option.data[i];
+                    // 涓烘瘡鏉¤褰曡缃勾浠藉拰鏈堜唤锛堣鐩栧師鏈夊�硷級
+                    item["骞翠唤"] = year;
+                    item["鏈堜唤"] = month;
+                    num.push(item);
                 }
             }
+            //var num = [];
+            //for (var i = 0; i < option.data.length; i++) {
+            //    if (option.data[i] != "") {
+            //        num.push(option.data[i])
+            //    }
+            //}
 
             var sSubStr = JSON.stringify(num);
             var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index 283f2fc..ab42dc1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -106,6 +106,16 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鐗╂枡绫诲瀷锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMaterTypeName" id="HMaterTypeName" lay-verify="HMaterTypeName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterType-BT" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
+                                                    </button>
+                                                    <input id="HMaterTypeID" name="HMaterTypeID" type="hidden" value="0" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
                                                 <label class="layui-form-label">浣跨敤鐘舵�侊細</label>
                                                 <div class="layui-input-inline">
                                                     <select name="HUseFlag" id="HUseFlag" lay-verify="HUseFlag">
@@ -264,6 +274,7 @@
                 var isEndCheck = document.getElementById("HStopflag").checked;
                 isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
                 var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+               
                 if (AllowLoadData()) {
                     $.ajax(
                         {
@@ -359,7 +370,7 @@
                 })
             });
 
-            //閫夋嫨榛樿涓嶈壇绫诲瀷
+            //閫夋嫨榛樿涓嶈壇绫诲瀷HMaterType-BT
             form.on('submit(HBadType-BT)', function () {//閫夋嫨閮ㄩ棬
                 layer.open({
                     type: 2
@@ -389,7 +400,36 @@
                    }
                 })
             });
+            //閫夋嫨榛樿涓嶈壇绫诲瀷HMaterType-BT
+            form.on('submit(HMaterType-BT)', function () {//閫夋嫨閮ㄩ棬
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '涓嶈壇绫诲瀷鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterTypeName").val(checkStatus.data[0].鐗╂枡鍒嗙被鍚嶇О);
+                        $("#HMaterTypeID").val(checkStatus.data[0].HItemID);
+                        //$("#HBadTypeNumber").val(checkStatus.data[0].涓嶈壇绫诲瀷浠ｇ爜);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    }
+                })
+            });
             //閫夋嫨榛樿宸ュ簭
             form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
                 layer.open({
@@ -488,6 +528,8 @@
                             $("#HProcNumber").val(data.宸ュ簭浠ｇ爜);//宸ュ簭浠ｇ爜
                             $("#HBadTypeName").val(data.涓嶈壇绫诲瀷);//榛樿涓嶈壇绫诲瀷
                             $("#HBadTypeID").val(data.HBadTypeID == null ? '0' : data.HBadTypeID);//涓嶈壇绫诲瀷ID
+                            $("#HMaterTypeName").val(data.鐗╂枡鍒嗙被);//榛樿涓嶈壇绫诲瀷
+                            $("#HMaterTypeID").val(data.HMaterTypeID == null ? '0' : data.HMaterTypeID);//涓嶈壇绫诲瀷ID
                             $("#HBadTypeNumber").val(data.涓嶈壇绫诲瀷浠ｇ爜);//涓嶈壇绫诲瀷浠ｇ爜
                             $("#HRemark").val(data.澶囨敞);//澶囨敞
                             $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
index 16a097c..f1904fb 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillEdit.html"
@@ -391,6 +391,8 @@
                             , "HMaterialCode": ""
                             , "HDeptName": ""
                             , "HDeptID": "0"
+                            , "HProcName": ""
+                            , "HProcID": "0"
                             , "HMoney": "0"
                             , "HWaster": "0"
                             , "HQty": "0"
@@ -862,6 +864,8 @@
                         , { field: 'HMaterialCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
                         , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true, style: 'background-color: #f9f9f9;' }
                         , { field: 'HDeptName', title: '閮ㄩ棬', edit: 'text', event: "HAreaList_2", style: 'background-color: #f9f9f9;' }
+                        , { field: 'HProcID', title: '宸ュ簭ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HProcName', title: '宸ュ簭', edit: 'text', event: "HProcList", style: 'background-color: #f9f9f9;' }
                         , { field: 'HMoney', title: '閲戦', edit: 'text', style: 'background-color: #f9f9f9;' }
                         , { field: 'HWaster', title: '鎹熻��', edit: 'text', style: 'background-color: #f9f9f9;' }
                         , { field: 'HQty', title: '鏁伴噺', edit: 'text', style: 'background-color: #f9f9f9;' }
@@ -892,6 +896,8 @@
                     , "HMaterialCode": ""
                     , "HDeptName": ""
                     , "HDeptID": "0"
+                    , "HProcName": ""
+                    , "HProcID": "0"
                     , "HMoney": "0"
                     , "HWaster": ""
                     , "HQty": "0"
@@ -952,9 +958,9 @@
                                 type: 2,
                                 skin: 'layui-layer-rim',
                                 area: ['90%', '90%'],
-                                title: '椤圭洰璐圭敤鍒楄〃',
+                                title: '鎴愭湰椤圭洰鍒楄〃',
                                 shift: 2,
-                                content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ItemMoney.html", "yes"],
+                                content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.html", "yes"],
                                 btn: ['纭畾', '鍙栨秷'],
                                 btn1: function (index, layero) {
                                     var iframeWindow = window['layui-layer-iframe' + index];
@@ -967,7 +973,7 @@
                                     var selected = checkStatus.data[0];
                                     obj.update({
                                         "HCostItemID": selected.HItemID || '',
-                                        "HCostItemName": selected['璐圭敤椤圭洰鍚嶇О'] || selected.璐圭敤椤圭洰鍚嶇О || ''
+                                        "HCostItemName": selected['鎴愭湰椤圭洰鍚嶇О'] || selected.璐圭敤椤圭洰鍚嶇О || ''
                                     });
                                     layer.close(index);
                                 },
@@ -1002,6 +1008,39 @@
                                         "HMaterID": selected.HItemID || '',
                                         "HMaterName": selected['鐗╂枡鍚嶇О'] || '',
                                         "HMaterialCode": selected['鐗╂枡浠ｇ爜'] || ''
+                                    });
+                                    layer.close(index);
+                                },
+                                end: function () {
+                                    tableEditObj = null;
+                                }
+                            });
+                        }
+                        // 宸ュ簭閫夋嫨
+                        else if (obj.event === 'HProcList') {
+                            CusType = 2;
+                            tableEditObj = obj;
+
+                            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');
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鐗╂枡鏁版嵁', { icon: 2 });
+                                    }
+
+                                    var selected = checkStatus.data[0];
+                                    obj.update({
+                                        "HProcID": selected.HItemID || '',
+                                        "HProcName": selected['宸ュ簭鍚嶇О'] || '',
+                                       
                                     });
                                     layer.close(index);
                                 },
@@ -1419,6 +1458,8 @@
                                         "HMaterialCode": row["鐗╂枡浠ｇ爜"] || "",
                                         "HDeptID": row["HDeptID"] || "0",
                                         "HDeptName": row["閮ㄩ棬"] || "",
+                                        "HProcID": row["HProcID"] || "0",
+                                        "HProcName": row["HProcName"] || "",
                                         "HSpecModel": "", // 鎮ㄧ殑鏁版嵁涓病鏈夎繖涓瓧娈�
                                         "HMoney": row["閲戦"] || 0,
                                         "HWaster": row["鎹熻�楅噺"] || 0, // 娉ㄦ剰瀛楁鍚嶆槸"鎹熻�楅噺"
@@ -1607,7 +1648,7 @@
                 var data = Array.isArray(selectData) ? selectData[0] : selectData;
                 window.tableEditObj.update({
                     "HCostItemID": data.HItemID || '',
-                    "HCostItemName": data['璐圭敤椤圭洰鍚嶇О'] || data.璐圭敤椤圭洰鍚嶇О || ''
+                    "HCostItemName": data['鎴愭湰椤圭洰鍚嶇О'] || data.璐圭敤椤圭洰鍚嶇О || ''
                 });
             }
         }
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillList.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillList.html"
index 8437e78..62d1b23 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillList.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\345\215\225/CB_ItemMoneyBillList.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>杩愬崟璐圭敤缁撶畻鍗�</title>
+    <title>鎴愭湰璐圭敤鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -200,7 +200,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "2102";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) || document.title;
+            var HPageTitle = '鎴愭湰璐圭敤鍗�';
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillEdit.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillEdit.html"
new file mode 100644
index 0000000..454cee9
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillEdit.html"
@@ -0,0 +1,1802 @@
+锘�
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鎴愭湰璐圭敤璋冩暣鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+    <style>
+        /* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
+        .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-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">
+                                            </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">
+                                                <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+                                            </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="HAccDate" name="HAccDate" id="HAccDate" style="width:190px;">
+                                            </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-inline">
+                                                <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-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; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+                                                    <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="HWHName" id="HWHName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">璋冨嚭浠撳簱<label style="color:red;"> * </label></label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                                <input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">涓氬姟鍛�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </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" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">楠屾敹浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                <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>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float: left; width: 150px; " readonly>
+                                                <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-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1160px;">
+                                            </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; width: 501px;">
+                                                <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+                                                    <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <!--闅愯棌瀛楁-->
+                                    <div class="layui-row" style="display:none;">
+                                        <div class="layui-inline">
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HMainSourceInterID" id="HMainSourceInterID" value="0" autocomplete="off">
+                                                <input class="layui-input" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0" autocomplete="off">
+                                                <input class="layui-input" name="HMainSourceBillNo" id="HMainSourceBillNo" value="" autocomplete="off">
+                                                <input class="layui-input" name="HMainSourceBillType" id="HMainSourceBillType" value="" autocomplete="off">
+                                            </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 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>
+                            </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>
+                                            <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>
+                        </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>
+
+        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 HModName = "CB_ChangeMoneyBillMain";
+            //鑾峰彇鍙傛暟
+            var params = getUrlVars();
+            var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷  1娣诲姞 淇濆瓨  2澶嶅埗  3 缂栬緫
+            var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+
+            window.CusType = 0;//鍏ㄥ眬鍙橀噺
+            window.OptionData = [];
+            //#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"; });
+            }
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1803";
+            var dataID = "";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) ||  $("h1").html() ;
+            $("h1").html('<b>' + HPageTitle + '</b>');
+            //#endregion
+
+            ColFilter();//鍙戠エ绫诲瀷
+
+
+            //#endregion
+
+            //#region 鍒ゆ柇骞惰缃搷浣滅被鍨嬨�侀〉闈㈠垵濮嬪寲
+            if (OperationType == null || OperationType == 1) {                            //鏂板
+                OperationType = 1;
+                //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+                createBillNo();
+
+                //瀛愯〃椤甸潰鍒濆鍖�
+                get_InitGrid();
+                //鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇 閮ㄩ棬 缁忔墜浜�
+                getCzyglByUser();
+
+                //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HAccDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+            }
+            else if (OperationType == 3) {                                                 //缂栬緫
+                //瀛愯〃椤甸潰鍒濆鍖�
+                get_InitGrid();
+
+                // 缂栬緫鏃讹紝鍏堝垵濮嬪寲缁勭粐锛屽畬鎴愬悗鍔犺浇鏁版嵁
+                Organ(function () {
+                    // 缁勭粐鍔犺浇瀹屾垚鍚庯紝鍐嶅姞杞界紪杈戦〉闈㈡暟鎹�
+                    RoadBillMain(linterid);
+                });
+            }
+            else if (OperationType == 4) {                     //涓嬫帹
+                setInit_PushBill();
+            }
+            //#endregion
+
+            //#region 缁勭粐鍒濆鍖�
+            Organ();
+            //#endregion
+
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 寮圭獥閫夋嫨瑙﹀彂浜嬩欢
+
+            //#region 閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptList)', function () {
+                get_checkDept();
+            });
+            //#endregion
+
+            //#region 閫夋嫨涓氬姟鍛樻寜閽�
+            form.on('submit(HEmpList)', function () {
+                get_checkEmp();
+            });
+            //#endregion
+
+            //#region 閫夋嫨璋冨嚭浠撳簱鎸夐挳
+            form.on('submit(HSCWHList)', function () {
+                get_checkSCcur();
+            });
+            //#endregion
+
+            //#region 閫夋嫨浠撳簱鎸夐挳
+            form.on('submit(HWHList)', function () {
+                get_checkCur();
+            });
+            //#endregion
+
+            //#region 閫夋嫨渚涘簲鍟嗘寜閽�
+            form.on('submit(HSupList)', function () {
+                get_checkSup();
+            });
+            //#endregion
+
+            //#region 閫夋嫨璐熻矗浜烘寜閽�
+            form.on('submit(HManagerList)', function () {
+                get_checkManager();
+            });
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹浜烘寜閽�
+            form.on('submit(HSecManagerList)', function () {
+                get_checkSecManager();
+            });
+            //#endregion
+
+            //#region 閫夋嫨淇濈浜烘寜閽�
+            form.on('submit(HKeeperList)', function () {
+                get_checkKeeper();
+            });
+            //#endregion
+
+            //#region 閫夋嫨璐圭敤椤圭洰鎸夐挳
+            form.on('submit(HPMList)', function () {
+                CusType = 1;
+                get_checkSS();
+            });
+            //#endregion
+
+            //#region 瀛愯〃锛氬ご宸ュ叿鏍忎簨浠�
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+
+                //鏂板琛岃〃鏍兼暟鎹�
+                var NewRow =
+                {
+                    "HCostItemID": "0"
+                    , "HCostItemName": ""
+                    , "HDeptID": "0"
+                    , "HDeptName": ""
+                    , "HMoney": "0"
+                    // , "HTaxRate": "0"
+                    // , "HSumMoney": "0"
+                    , "HRemark": ""
+   
+                };
+                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++) {
+                            $('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").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++) {
+                                $('#HTransType' + i + '').find("option[value='" + option.data[i - 1].HTransType + "']").attr("selected", true);
+
+                            }
+                            form.render('select');
+                        }
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn':
+                        get_HideColumn();
+                        break;
+                }
+            });
+            //#endregion
+
+            //#region 瀛愯〃锛氳鍐呬簨浠�
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+
+            });
+
+            //#endregion
+
+            //#region 鐩戝惉鍗曞厓鏍肩紪杈�  鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+            table.on('edit(mainTable)', function (obj) {
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                var oldText = $(this).prev().text();
+                var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                    , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                    , field = obj.field; //寰楀埌瀛楁
+
+
+                switch (field) {
+                    case "HMoney":                   //涓嶅惈绋庨噾棰�
+                        //鏁版嵁鏍煎紡鏍￠獙
+                        temp = value + "";
+                        if (!ref.test(temp) || temp == 0) {
+                            //鎭㈠鏁版嵁鍒扮紪杈戝墠
+                            obj.update({
+                                HMoney: oldText
+                            });
+                            table.render(option);
+
+                            layer.msg("璇疯緭鍏ュぇ浜�0鐨勬暟瀛�!");
+                            return;
+                        }
+                }
+            });
+            //#endregion
+
+
+            //#region 琛ㄦ牸琛岄�夋嫨澶勭悊
+            form.on('select(HTransType)', 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.HTransType = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 澶嶉�夋瑙﹀彂浜嬩欢
+            //#endregion
+
+            //#region 鏂囨湰妗嗙洃鍚�
+            $(document).ready(function () {
+                //#region 涓嶅惈绋庨噾棰濆け鐒︿簨浠�
+                var oldHMoney = "";                          //淇敼鍓嶇殑鍊�
+                var newHMoney = "";                          //淇敼鍚庣殑鍊�
+
+                $("#HMoney").on('focus', function (data) {
+                    oldHMoney = $("#HMoney").val() * 1;   //涓嶅惈绋庨噾棰濇枃鏈鑾峰彇鐒︾偣鏃惰幏鍙栦慨鏀瑰墠鐨勫��
+                }).on('blur', function (data) {
+                    newHMoney = $("#HMoney").val();       //涓嶅惈绋庨噾棰濇枃鏈澶辩劍鏃惰幏鍙栦慨鏀瑰悗鐨勫��
+                    //鍒ゆ柇杈撳叆鐨勯噾棰濇槸鍚﹀悎娉�
+                    var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                    if (!ref.test(newHMoney)) {
+                        layer.msg("涓嶅惈绋庨噾棰濊杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
+                        $("#HMoney").val(oldHMoney);
+                        return false;
+                    }
+
+                    //杈撳叆鐨勪笉鍚◣閲戦鍚堟硶锛岄噸
+                    var HMoney = newHMoney * 1; //绠楁�婚噾棰�                       //涓嶅惈绋庨噾棰�
+                    var HTaxRate = $("#HTaxRate").val() * 1;      //绋庣巼
+                    var HRelSumMoney = HMoney * (1 + HTaxRate);    //鎬婚噾棰�
+
+                    //$("#HSumMoney").val(HRelSumMoney);
+
+                });
+                //#endregion
+
+
+
+
+
+                //#region 绋庣巼澶辩劍浜嬩欢
+                var oldHTaxRate = "";                          //淇敼鍓嶇殑鍊�
+                var newHTaxRate = "";                          //淇敼鍚庣殑鍊�
+
+                $("#HTaxRate").on('focus', function (data) {
+                    oldHTaxRate = $("#HTaxRate").val() * 1;   //绋庣巼鏂囨湰妗嗚幏鍙栫劍鐐规椂鑾峰彇淇敼鍓嶇殑鍊�
+                }).on('blur', function (data) {
+                    newHTaxRate = $("#HTaxRate").val();       //绋庣巼鏂囨湰妗嗗け鐒︽椂鑾峰彇淇敼鍚庣殑鍊�
+                    //鍒ゆ柇杈撳叆鐨勭◣鐜囨槸鍚﹀悎娉�
+                    var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                    if (!ref.test(newHTaxRate)) {
+                        layer.msg("绋庣巼璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
+                        $("#HTaxRate").val(oldHTaxRate);
+                        return false;
+                    }
+
+                    //杈撳叆鐨勭◣鐜囷紝
+                    var HTaxRate = newHTaxRate * 1; //绋庣巼
+                    var HSumMoney = $("#HSumMoney").val() * 1;      //鍗曟嵁閲戦
+                    var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));    //涓嶅惈绋庨噾棰�
+
+                    $("#HMoney").val(HMoney);
+
+                });
+                //#endregion
+
+                ///涓嶅惈绋庨噾棰�= 鍚◣閲戦/锛�100+绋庣巼锛�/100
+
+                //#region 鍗曟嵁閲戦澶辩劍浜嬩欢
+                var oldHSumMoney = "";                          //淇敼鍓嶇殑鍊�
+                var newHSumMoney = "";                          //淇敼鍚庣殑鍊�
+
+                $("#HSumMoney").on('focus', function (data) {
+                    oldHSumMoney = $("#HSumMoney").val() * 1;   //鍗曟嵁閲戦鏂囨湰妗嗚幏鍙栫劍鐐规椂鑾峰彇淇敼鍓嶇殑鍊�
+                }).on('blur', function (data) {
+                    newHSumMoney = $("#HSumMoney").val();       //鍗曟嵁閲戦鏂囨湰妗嗗け鐒︽椂鑾峰彇淇敼鍚庣殑鍊�
+                    if (newHSumMoney != 0) {
+                        //鍒ゆ柇杈撳叆鐨勯噾棰濇槸鍚﹀悎娉�
+                        var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                        if (!ref.test(newHSumMoney)) {
+                            layer.msg("鎬婚噾棰濊杈撳叆涓嶅皬浜�0鐨勬暟瀛�!");
+                            $("#HSumMoney").val(oldHSumMoney);
+                            return false;
+                        }
+
+                        //杈撳叆鐨勬�婚噾棰濆悎娉曪紝閲嶇畻涓嶅惈绋庨噾棰�
+                        var HSumMoney = newHSumMoney * 1;                    //涓嶅惈绋庨噾棰�
+                        var HTaxRate = $("#HTaxRate").val() * 1;      //绋庣巼
+                        var HMoney = HSumMoney / (100 + HTaxRate) / 100;    //涓嶅惈绋庨噾棰�
+
+                        $("#HMoney").val(HMoney);
+                    }
+
+                });
+                //#endregion
+                //#endregion
+            });
+            //#endregion
+
+
+            //#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
+            //#region 淇濆瓨鎻愪氦
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                console.log("data瀵硅薄锛�", data);
+                console.log("琛ㄥ崟瀛楁鍊硷細", data.field);
+                if (AllowLoadData(data)) {
+                    set_AddNew(data);
+                }
+            });
+            //#endregion
+
+
+
+            //#region 閫�鍑�
+            form.on('submit(btnEdit)', function (data) {
+                if (params[1] != null) {
+                    Pub_Close(1);
+                } else if (params[1] == null) {
+                    Pub_Close(2);
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+
+            //#region 鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+            //#region 鑾峰彇鍙傛暟
+            function getUrlVars() {
+                var vars = [], hash;
+                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+                for (var i = 0; i < hashes.length; i++) {
+                    hash = hashes[i].split('=');
+                    vars.push(hash[0]);
+                    vars[hash[0]] = hash[1];
+                }
+                return vars;
+            }
+            //#endregion
+
+            //#region 鐢熸垚鍗曟嵁鍙�
+            function createBillNo() {
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '1803' },
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].HInterID);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region  鏃堕棿杞崲
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) {
+                    month = '0' + month;
+                }
+                if (day.length < 2) {
+                    day = '0' + day;
+                }
+
+                return [year, month, day].join('-');
+            }
+            //#endregion
+
+            //#region 鑾峰彇缁勭粐
+            function Organ(callback) {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                var Organization = '';
+                var HOrgIDBar = '';
+                $.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 || OperationType == 4) {
+                                HOrgIDBar = sessionStorage["OrganizationID"];
+                                $("#HOrgID").val(HOrgIDBar);
+                            }
+
+                            form.render('select');
+
+                            // 鎵ц鍥炶皟鍑芥暟
+                            if (callback && typeof callback === 'function') {
+                                callback();
+                            }
+                        }
+                        layer.closeAll("loading");
+                    }
+                });
+            }
+            //#endregion
+
+
+            //#region 寮圭獥椤甸潰鏂规硶
+
+
+            //#region 鎴愭湰璋冩暣鍗曞瓙琛ㄥ垵濮嬪寲
+            function get_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    ,limit:100
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HCostItemID', title: '鎴愭湰椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HCostItemName', title: '鎴愭湰椤圭洰', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
+                        , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HDeptName', title: '閮ㄩ棬', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMoney', title: '璋冩暣閲戦', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterID', title: '鐗╂枡鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', event: "HAreaList_2", style: 'background-color: #f9f9f9;' }
+
+/*                        , { field: 'HTaxRate', title: '绋庣巼',  edit: 'text', style: 'background-color: #f9f9f9;' }*/
+                        //, { field: 'HQty', title: '鏁伴噺', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        //, { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
+
+                        , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+
+                var rowdata = [
+                    {
+                        "HCostItemID": "0"
+                        ,"HCostItemName": ""
+                        ,"HDeptID": "0"
+                        ,"HDeptName": ""
+                        , "HMoney": "0"
+                        , "HMaterID": "0"
+                        ,"HMaterName":""
+                       // , "HTaxRate": "0"
+                       // , "HSumMoney": "0"
+                        , "HRemark": ""
+                    }
+                ];
+                option.data = rowdata;
+                table.render(option);
+                DisPlay_HideColumn();
+            }
+            //#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) {
+                        //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++) {
+                            //鍙戠エ绫诲瀷
+                            $('#HTransType' + (i + 1)).find("option[value='" + oldData[i].HTransType + "']").attr("selected", true);
+                        }
+                        form.render('select');
+                        layer.close(index);
+                        /*}*/
+                    });
+                }
+            }
+            //#endregion
+
+            //#region 寮圭獥椤甸潰鏂规硶
+
+            //#region 瀛愯〃锛氬揩鎹烽敭(F7)鎵撳紑寮圭獥
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        //鍣ㄥ叿绠＄悊
+                        if (obj.event == "HAreaList") {
+                            CusType = 2;
+                            //鎵撳紑鎴愭湰椤圭洰绠＄悊灏忕獥浣�
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '鎴愭湰椤圭洰鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                //, content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CostItem.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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //OptionData = checkStatus.data[0];
+                                        obj.update({
+                                            "HCostItemID": checkStatus.data[0].HItemID
+                                            ,"HCostItemName": checkStatus.data[0].鎴愭湰椤圭洰鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                 }
+                                , end: function () {
+                                //obj.update({
+                                //    "HBeginAddr": OptionData.HItemID
+                                //    , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
+                                //})
+                            }
+                        })
+                        }
+                        if (obj.event == "HAreaList_1") {
+                            CusType = 2;
+                            //鎵撳紑閮ㄩ棬绠＄悊灏忕獥浣�
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                //, content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
+                                , 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('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //OptionData = checkStatus.data[0];
+                                    obj.update({
+                                        "HDeptID": checkStatus.data[0].HItemID
+                                        , "HDeptName": checkStatus.data[0].閮ㄩ棬鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HBeginAddr": OptionData.HItemID
+                                    //    , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+
+                        if (obj.event == "HAreaList_2") {
+                            CusType = 2;
+                            //鎵撳紑鍣ㄥ叿绠＄悊灏忕獥浣�
+                            layer.open({
+                                type: 2//寮圭獥绫诲瀷
+                                , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                , area: ['90%', '90%']//澶у皬
+                                , title: '鐗╂枡鍒楄〃'//鏍囬
+                                , shift: 2//寮瑰嚭鍔ㄧ敾
+                                //, content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html?OperationType=2", "yes"]
+                                , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html", "yes"]
+                                , btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //OptionData = checkStatus.data[0];
+                                    obj.update({
+                                        "HMaterID": checkStatus.data[0].HItemID
+                                        , "HMaterName": checkStatus.data[0].鐗╂枡鍚嶇О
+                                    })
+                                    layer.close(index);//鍏抽棴寮圭獥
+                                }
+                                , end: function () {
+                                    //obj.update({
+                                    //    "HBeginAddr": OptionData.HItemID
+                                    //    , "HBeginAddrName": OptionData.鍦板尯鍚嶇О
+                                    //})
+                                }
+                            })
+                        }
+                    obj.event = "";
+                    return false;
+                }
+
+            })
+        }
+            //#endregion
+
+
+            //#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_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) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨璐熻矗浜�
+            function get_checkManager() {
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨楠屾敹浜�
+            function get_checkSecManager() {
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSecManagerName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨淇濈浜�
+            function get_checkKeeper() {
+                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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HKeeperName").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+                        $("#HKeeperID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+            function getUrlVars_JSON() {
+                var datajson;
+                var str = window.location.search; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+                var arr = str.substring(str.lastIndexOf("=") + 1);
+                datajson = $.parseJSON(decodeURI(arr));
+                return datajson;
+            }
+            //#endregion
+
+            //#region 涓嬫帹椤甸潰鍒濆鍖�
+            function setInit_PushBill() {
+                //鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
+                createBillNo();
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , totalRow: true
+                    , cellMinWidth: 120
+                    , height: 400
+                    , limit: 100
+                    , cols: [[
+                        { type: 'checkbox', totalRowText: '鍚堣琛�' }
+                        , { type: 'numbers', field: '搴忓彿', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HCostItemID', title: '鎴愭湰椤圭洰ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HCostItemName', title: '鎴愭湰椤圭洰', edit: 'text', event: "HAreaList", style: 'background-color: #f9f9f9;' }
+                        , { field: 'HDeptID', title: '閮ㄩ棬ID', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HDeptName', title: '閮ㄩ棬', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMoney', title: '璋冩暣閲戦', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterID', title: '鐗╂枡鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
+                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', event: "HAreaList_1", style: 'background-color: #f9f9f9;' }
+
+                        /*{ field: 'HTaxRate', title: '绋庣巼',  edit: 'text', style: 'background-color: #f9f9f9;' }*/
+                        //, { field: 'HQty', title: '鏁伴噺', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        //, { field: 'HPrice', title: '鍗曚环', edit: 'text', style: 'background-color: #f9f9f9;' }
+
+                        , { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', style: 'background-color: #f9f9f9;' }
+                        , { fixed: 'right', field: '鎿嶄綔', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                }
+                //鍒濆鍖栨棩鏈熴�佸埗鍗曚汉銆佸埗鍗曟棩鏈�
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HReceiveDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HMaker").val(sessionStorage["HUserName"]);
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+                $("#HDeptID").val(sessionStorage["HDeptID"]);
+                $("#HDeptName").val(sessionStorage["HDept"] );
+                $("#HDeptName").val(sessionStorage["HDept"] );
+                $("#HEmpID").val(sessionStorage["HEmpID"]);
+                $("#HEmpName").val(sessionStorage["HEmpName"]);
+
+                //璁剧疆婧愬崟绫诲瀷
+                //$("#HSourceBillType").val(HSourceBillType);
+                //var temp = $("#HSourceBillType").val();
+                //绂佺敤缁勭粐閫夐」
+                $("#HOrgID").attr("disabled", true);
+                //$("#HSourceBillType").val() == "3321"
+                if (true) {
+                    //鑾峰彇 getUrlVars
+                    var data = getUrlVars_JSON().data;
+                    var dataArray = [];
+
+                    for (var i = 0; i < data.length; i++) {
+                        var temp = getPushSource_ICMOBillInit(data[i].HInterID, data[i].HEntryID);
+                        if (temp != "none") {
+                            dataArray.push(temp);
+                            dataID = dataID + "," + data[i].HInterID;
+                        } else {
+                            layer.alert("鐩爣鎵胯繍鍟嗗拰杩愬崟鎵胯繍鍟嗕笉鍚�!", {
+                                icon: 5,
+                                btn: ['纭畾']
+                            }, function () {
+                                // 鍏抽棴褰撳墠寮圭獥
+                                var index = parent.layer.getFrameIndex(window.name);
+                                parent.layer.close(index);
+                                parent.$("#btnSearch").trigger('click');
+
+                              
+                            });
+                            return;
+                        }
+                    }
+                    form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                        "HMainSourceInterID": "0"
+                        , "HMainSourceEntryID": "0"
+                        , "HMainSourceBillNo": ""
+                        , "HMainSourceBillType": $("#BillType").val()
+
+
+                        , "HCarrierID": dataArray[0].鎵胯繍鍟咺D
+                        , "HCarrierName": dataArray[0].鎵胯繍鍟嗗悕绉�
+                        , "HCurID": dataArray[0].甯佸埆
+                        , "HCurName": dataArray[0].甯佸埆鍚嶇О
+                       // , "HExRate": dataArray[0].姹囩巼
+                    });
+
+                    //瀛愯〃  璧嬪��
+                    var rowdata = [];
+                    for (var i = 0; i < dataArray.length; i++) {
+                        rowdata.push(
+                            {
+                                'HCostItemID': dataArray[i].鎴愭湰椤圭洰
+                                , 'HCostItemName': dataArray[i].鎴愭湰椤圭洰鍚嶇О??""
+                                , 'HDeptID': dataArray[i].閮ㄩ棬
+                                , 'HDeptName': dataArray[i].閮ㄩ棬鍚嶇О ?? ""
+                                , "HTransType": dataArray[i].杩愯緭鏂瑰紡 ?? ""
+                                , "HMoney": dataArray[i].杩愯緭璐圭敤 ?? ""
+                            }
+                        );
+                    }
+                    option.data = rowdata;
+                    table.render(option);
+                }
+                else {
+                    return layer.msg('褰撳墠涓嶆敮鎸佽婧愬崟涓嬫帹锛侊紒');
+                }
+            }
+            //#endregion
+
+            //#region 浠撳簱閫夋嫨椤甸潰
+            function get_checkCur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 璋冨嚭浠撳簱閫夋嫨椤甸潰
+            function get_checkSCcur() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '璋冨嚭浠撳簱鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSCWHName").val(checkStatus.data[0].浠撳簱鍚嶇О);
+                        $("#HSCWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 渚涘簲鍟嗛�夋嫨椤甸潰
+            function get_checkSup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '渚涘簲鍟嗗垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+
+                        $("#HSupID").val(checkStatus.data[0].HItemID);
+                        $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+          
+
+            //#region 鍙戠エ绫诲瀷    涓嬫媺妗�
+            function ColFilter() {
+                var HTypeSelect = "";
+                var HTypeList = ["鏅�氬彂绁�", "澧炲�肩◣鍙戠エ", "鍏朵粬"];
+                for (var i = 0; i < HTypeList.length; i++) {
+                    if (i == 0) {
+                        HTypeSelect += '<option  style="color:blue;" selected="selected" value="' + HTypeList[i] + '">' + HTypeList[i] + '</option>';
+                    } else {
+                        HTypeSelect += '<option  style="color:blue;" value="' + HTypeList[i] + '">' + HTypeList[i] + '</option>';
+                    }
+                }
+                $("#HType").empty();
+                $("#HType").append(HTypeSelect);
+                form.render('select');
+            }
+            //#endregion
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(data) {
+
+                //鏁板�兼牸寮忔牎楠屽伐鍏�
+                var ref = /^\d+(\.\d+)?$/;          //闈炶礋鏁版鍒欒〃杈惧紡
+                var temp = "";
+
+                //#region 琛ㄥご鏁版嵁妫�楠�
+                //if ($("#HBillNo").val() == "") {
+                //    layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!");
+                //    return false;
+                //}
+                //if ($("#HDate").val() == "") {
+                //    layer.msg("鏃ユ湡涓嶈兘涓虹┖!");
+                //    return false;
+                //}
+
+                //if ($("#HCusID").val() == "0") {
+                //    layer.msg("瀹㈡埛涓嶈兘涓虹┖!");
+                //    return false;
+                //}
+
+                if ($("#HEmpID").val() == "0") {
+                    layer.msg("缁忔墜浜烘湭閫夋嫨!");
+                    return false;
+                }
+                //#region 瀛愯〃鏍￠獙
+                for (var i = 0; i < option.data.length; i++) {
+
+
+                    ////璐圭敤椤圭洰鏍￠獙
+                    //if (option.data[i].HProjectMoneyID == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細璇烽�夋嫨璐圭敤椤圭洰锛�");
+                    //    return false;
+                    //}
+
+                    //鏁伴噺鏍煎紡鏍￠獙
+                    //temp = option.data[i]["HMoney"] + "";
+                    //if (temp == "0") {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細涓嶅惈绋庨噾棰濅笉鑳戒负0锛�");
+                    //    return false;
+                    //} else if (!ref.test(temp)) {
+                    //    layer.msg("绗�" + (i + 1) + "琛岋細涓嶅惈绋庨噾棰濊杈撳叆澶т簬0鐨勬暟瀛楋紒");
+                    //    return false;
+                    //}
+
+                   
+
+                    
+                }
+                //#endregion
+                return true;
+            }
+            //#endregion
+            //#endregion
+
+
+            //#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])
+                    }
+                }
+
+                //鑾峰彇鎿嶄綔鏂瑰紡
+                var refSav = "";
+                if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
+                    refSav = "Add";
+                }
+                if (OperationType == 3) {
+                    refSav = "Update";
+                }
+                var arrayID = "";
+                //鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
+                if (OperationType == 3) {
+                    data.field.HUpDater = sessionStorage["HUserName"];
+                    data.field.HUpDateDate = Format(new Date(), "yyyy-MM-dd");
+                    $("#HUpDater").val(sessionStorage["HUserName"]);
+                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    
+                }
+                if (OperationType == 4) {
+                    arrayID = dataID;
+                }
+
+                //鑾峰彇琛ㄥご鏁版嵁骞跺簭鍒楀寲
+                var sMainStr = JSON.stringify(data.field);              //涓昏〃鏁版嵁
+                //鍏朵粬搴旀敹鍗曞瓙琛ㄥ簭鍒楀寲
+                var sSubStr = JSON.stringify(num);
+                //鎷兼帴搴忓垪鍖栫殑鏁版嵁
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"] + ';' + arrayID;
+
+
+                $.ajax({
+                    url: GetWEBURL() + "CB_ChangeMoneyBillController/saveBILL", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    type: "POST",
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                layer.msg("鎻愪氦鎴愬姛");
+                            });
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫椤甸潰鍒濆鍖�
+            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+            {
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "CB_ChangeMoneyBillController/CB_ChangeMoneyBillEditList",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            //var data1 = result.data[1];
+                            form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data[0]["HInterID"]
+                                , "HBillNo": data[0]["鍗曟嵁鍙�"]
+                                , "HDate": formatDate(data[0]["鏃ユ湡"])
+
+
+                                , "HSupID": data[0]["HSupID"]
+                                , "HSupName": data[0]["渚涘簲鍟嗗悕绉�"]
+                                , "HWHID": data[0]["HWHID"]
+                                , "HWHName": data[0]["浠撳簱鍚嶇О"]
+                                , "HSCWHID": data[0]["HSCWHID"]
+                                , "HSCWHName": data[0]["璋冨嚭浠撳簱鍚嶇О"]
+                                , "HManagerID": data[0]["HManagerID"]
+                                , "HSecManagerID": data[0]["HSecManagerID"]
+                                , "HSecManagerName": data[0]["楠屾敹浜哄悕绉�"]
+                                , "HKeeperID": data[0]["HKeeperID"]
+                                , "HKeeperName": data[0]["淇濈鍛樺悕绉�"]
+                                , "HExplanation": data[0]["鎽樿"]
+                                , "HInnerBillNo": data[0]["HInnerBillNo"]
+                                , "HDeptID": data[0]["HDeptID"]
+                                , "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
+                                , "HEmpID": data[0]["HEmpID"]
+                                , "HEmpName": data[0]["涓氬姟鍛樺悕绉�"]
+                                , "HManagerName": data[0]["璐熻矗浜哄悕绉�"]
+
+
+
+                                , "HRemark": data[0]["琛ㄥご澶囨敞"]
+
+                                , "HMainSourceInterID": data[0]["HMainSourceInterID"] == null ? 0 : data[0]["HMainSourceInterID"]
+                                , "HMainSourceEntryID": data[0]["HMainSourceEntryID"] == null ? 0 : data[0]["HMainSourceEntryID"]
+                                , "HMainSourceBillNo": data[0]["HMainSourceBillNo"]
+                                , "HMainSourceBillType": data[0]["HMainSourceBillType"]
+
+                                , "HMaker": data[0]["鍒跺崟浜�"]
+                                , "HMakeDate": data[0]["鍒跺崟鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍒跺崟鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HUpDater": data[0]["淇敼浜�"]
+                                , "HUpDateDate": data[0]["淇敼鏃ユ湡"] == null ? "" : Format(new Date(data[0]["淇敼鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HChecker": data[0]["瀹℃牳浜�"]
+                                , "HCheckDate": data[0]["瀹℃牳鏃ユ湡"] == null ? "" : Format(new Date(data[0]["瀹℃牳鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HCloseMan": data[0]["鍏抽棴浜�"]
+                                , "HCloseDate": data[0]["鍏抽棴鏃ユ湡"] == null ? "" : Format(new Date(data[0]["鍏抽棴鏃ユ湡"]), "yyyy-MM-dd")
+                                , "HDeleteMan": data[0]["浣滃簾浜�"]
+                                , "HDeleteDate": data[0]["浣滃簾鏃ユ湡"] == null ? "" : Format(new Date(data[0]["浣滃簾鏃ユ湡"]), "yyyy-MM-dd")
+                            });
+                            //Organ();
+                            form.render('select');
+                            form.render('checkbox');
+                            //HOrgIDBar = data[0]["HOrgID"] == null ? 0 : data[0]["HOrgID"];
+                            var rowdata = [];
+                            //瀛愯〃鏁版嵁璧嬪��
+                            
+                            for (var i = 0; i < data.length; i++) {
+                                rowdata.push(
+                                    {
+                                        "HCostItemID": data[i].HCostItemID, "HDeptID": data[i].閮ㄩ棬, "HMaterID": data[i].HMaterID,"HMaterName":data[i].鐗╂枡鍚嶇О,
+                                        "HCostItemName": data[i].鎴愭湰椤圭洰鍚嶇О, "HDeptName": data[i].閮ㄩ棬鍚嶇О2, "HMoney": data[i].璋冩暣閲戦, "HRemark": data[i].琛ㄤ綋澶囨敞, "LAY_TABLE_INDEX": i
+                                    }
+                                )
+                                //鍙戠エ绫诲瀷
+                                //$('#HTransType' + (i + 1)).find("option[value='" + data[i].HTransType + "']").attr("selected", true);
+                            }
+                            option.data = rowdata;
+                            table.render(option);
+                            setTimeout(function () {
+                                for (var i = 0; i < rowdata.length; i++) {
+                                    var selectId = 'HTransType' + (i + 1);
+                                    var selectElem = $('#' + selectId);
+                                    if (selectElem.length > 0) {
+                                        selectElem.val(rowdata[i].HTransType);
+                                    }
+                                }
+                                form.render('select'); // 閲嶆柊娓叉煋涓嬫媺妗�
+                            }, 100);
+
+
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鏍规嵁鐧诲綍鐢ㄦ埛 鑾峰彇閮ㄩ棬  缁忔墜浜�
+            function getCzyglByUser() {
+                $.ajax({
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCzyglByUser",
+                    async: false,
+                    type: "GET",
+                    data: {
+                        "CurUserName": sessionStorage["HUserName"]
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+
+                            $("#HEmpID").val(data.HEmpID);  //缁忔墜浜篿d
+                            $("#HEmpName").val(data.HEmpName);  //缁忔墜浜�
+                            $("#HDeptID").val(data.HDeptID);      //閮ㄩ棬id
+                            $("#HDeptName").val(data.HDeptName);  //閮ㄩ棬
+
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鍒楄缃�
+            //闅愯棌鍒楄缃�
+
+            function get_HideColumn() {
+                var colName = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["field"] + ",";
+                }
+
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        //鍒濆鍖栭〉澶у皬
+                        DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+                        //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+                        get_FastQuery(table, option, 1)
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //function get_HideColumn() {
+            //    var colName = "";
+            //    for (var i = 1; i < option.cols[0].length - 1; i++) {
+            //        colName += option.cols[0][i]["field"] + ",";
+            //    }
+            //    var colTitleName = "";
+            //    for (var i = 1; i < option.cols[0].length - 1; i++) {
+            //        colTitleName += option.cols[0][i]["title"] + ",";
+            //    }
+            //    colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+            //    layer.open({
+            //        type: 2
+            //        , skin: "layui-layer-rim" //鍔犱笂杈规
+            //        , title: "闅愯棌鍒楄缃�"  //鏍囬
+            //        , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+            //        , shift: 2 //寮瑰嚭鍔ㄧ敾
+            //        , area: ["50%", "90%"] //绐椾綋澶у皬
+            //        , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+            //        , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+            //        , btn: ["纭畾", "鍙栨秷"]
+            //        , btn1: function (index, laero) {
+            //            //鍒锋柊琛ㄦ牸鏁版嵁
+            //            DisPlay_HideColumn();
+            //            //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+            //            layer.close(index);//鍏抽棴寮圭獥
+            //        }
+            //    })
+            //}
+
+            //鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    async: false,
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 2; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                                //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                                if (dataCols[4] != null && dataCols[4] != "") {
+                                    option.cols[0][i + 1]["title"] = dataCols[4];
+                                }
+                            }
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#endregion
+
+        });
+
+        function GetHDeptNameValue(obj)  //杩斿洖閮ㄩ棬
+        {
+            $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+            $("#HDeptID").val(obj[0].HItemID);
+        }
+
+        function GetHCarrierNameValue(obj)  //杩斿洖渚涘簲鍟�
+        {
+            $("#HCarrierName").val(obj[0].渚涘簲鍟嗗悕绉�);
+            $("#HCarrierID").val(obj[0].HItemID);
+        }
+
+        function GetProjectMoneyValue(obj)  //杩斿洖椤圭洰璐圭敤
+        {
+            if (CusType == 1) {
+                $("#HProjectMoneyName").val(obj.椤圭洰璐圭敤鍚嶇О);
+                $("#HProjectMoneyID").val(obj.HItemID);
+            } else if (CusType ==2) {
+                OptionData = obj;
+            }
+
+        }
+
+        //  //鍙屽嚮杩斿洖椤圭洰璐圭敤
+        //function GetProjectMoneyValue(data) {
+        //     OptionData = data
+        // }
+
+        //function GetHEmpValue(obj)  //杩斿洖缁忔墜浜�
+        //{
+        //    $("#HEmpName").val(obj[0].HName);
+        //    $("#HEmpID").val(obj[0].HItemID);
+        //}
+
+        //function GetHSupValue(obj)  //杩斿洖瀹㈡埛
+        //{
+        //    $("#HCusName").val(obj[0].HName);
+        //    $("#HCusID").val(obj[0].HItemID);
+        //}
+        //#region 澶勭悊灏忔暟鏄剧ず浣嶆暟锛坉ata锛氶渶瑕佸鐞嗙殑鏁版嵁锛沶um锛氭暟鎹殑绫诲瀷(濡�1:鏁伴噺锛�2:閲戦锛�3:鍗曚环)锛�
+        function dealDoubleToFixed(data, num) {
+            //鐢ㄤ簬璁剧疆灏忔暟浣嶆暟
+            var dotLength = 0;
+
+            if (num == 1) {                                    //褰撴暟鎹负鏁伴噺鏃讹紝鏈�澶氫繚鐣�6浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�6浣嶅皬鏁�
+                dotLength = 6;
+            } else if (num == 2) {                             //褰撴暟鎹负閲戦鏃讹紝鏈�澶氫繚鐣�2浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�2浣嶅皬鏁�
+                dotLength = 2;
+            } else if (num == 3) {                             //褰撴暟鎹负鍗曚环鏃讹紝鏈�澶氫繚鐣�4浣嶅皬鏁�
+                //璁剧疆鏈�澶氫繚鐣�4浣嶅皬鏁�
+                dotLength = 4;
+            }
+
+            //鍒ゆ柇鏄惁瀛樺湪灏忔暟鐐瑰強鍏剁储寮曚綅缃�
+            data = data + "";
+            var index = data.indexOf(".");
+
+            //澶勭悊鏁版嵁骞惰繑鍥�
+            if (index < 0) {
+                return data * 1;
+            } else {
+                //鑾峰彇灏忔暟浣嶆暟
+                var length = data.length - index - 1;
+                if (length <= dotLength) {
+                    return data * 1;
+                } else {
+                    data = data * 1;
+                    return data.toFixed(dotLength);
+                }
+            }
+        }
+            //#endregion
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillList.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillList.html"
new file mode 100644
index 0000000..c42745a
--- /dev/null
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\346\210\220\346\234\254\350\264\271\347\224\250\350\260\203\346\225\264\345\215\225/CB_ChangeMoneyBillList.html"
@@ -0,0 +1,1334 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鎴愭湰璐圭敤璋冩暣鍗曠淮鎶�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PageTitle.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鏃ユ湡闂撮殧</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>
+                                <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">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <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 = "CB_ChangeMoneyBillList";
+
+            //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+            var titleData = ["HInterID", "HDeptID", "HEmpID",  "HCurID", "HSupID", "HProjectMoneyID","瀛愯垂鐢ㄩ」鐩甀D"];
+
+            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+            var HModuleType = "1803";
+            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //杩囨护鏉′欢鐨刢lass绫�
+            var HClassTag = "ForFilteringSchemes";
+            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+            window.HModuleName = "鎴愭湰璐圭敤璋冩暣鍗曞垪琛�";
+            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+            window.HDefaultFilter = "";
+            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+            window.HInterID_Choose = 0;
+
+            //#endregion
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+
+                    //瀹℃牳鎸夐挳      锛�1:瀹℃牳銆�2:鍙嶅鏍革級
+                    case 'btn-Audit':
+                        set_CheckBill(0);
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_CheckBill(1);
+                        break;
+                    //鍏抽棴鎸夐挳        锛�1:鍏抽棴銆�2:鍙嶅叧闂級
+                    case 'btn-Close':
+                        set_CloseBill(0);
+                        break;
+                    //鍙嶅叧闂寜閽�
+                    case 'btn-DeClose':
+                        set_CloseBill(1);
+                        break;
+                    //浣滃簾鎸夐挳        锛�1:浣滃簾銆�2:鍙嶄綔搴燂級
+                    case 'btn-Drop':
+                        set_DropBill(0);
+                        break;
+                    //鍙嶄綔搴熸寜閽�
+                    case 'btn-DeDrop':
+                        set_DropBill(1);
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                    //鍒楄缃�
+                    case 'set_HideColumn': get_HideColumn();
+                        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 鍙屽嚮杩涘叆缂栬緫
+            table.on('rowDouble(mainTable)', function (obj) {
+                //閫変腑楂樹寒 鍙屽嚮琛�
+                obj.tr.find(':checkbox').prop('checked', true);
+                obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //璁剧疆澶嶉�夋閫変腑鏍峰紡
+                $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+                //mainTable 涓鸿〃鏍糏D   娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+                layui.each(table.cache.mainTable, function (i, l) {
+                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+                        l.LAY_CHECKED = true;
+                    }
+                });
+
+                var linterid = obj.data["hmainid"];
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '鏀舵鍗�-缂栬緫'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鎴愭湰绠＄悊/鎴愭湰璐圭敤璋冩暣鍗�/CB_ChangeMoneyBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    , btn: ['纭畾'],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            });
+            //#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(2);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#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(1);
+                //Organ();
+
+                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+                get_DefaultModule();
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , totalRow: true
+                    //, cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+            //#endregion
+            //#endregion  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+
+                //鍗曟嵁鍙疯秴閾炬帴
+                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../../鎴愭湰绠＄悊/鎴愭湰璐圭敤璋冩暣鍗�/CB_ChangeMoneyBillEdit.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() + '/CB_ChangeMoneyBillController/CB_ChangeMoneyBillList',
+                    async: false,
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+
+                            var data = [];
+                            var col = [];
+                            var totalArray = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+                       /*     col.push({ type: 'checkbox', fixed: 'left' });*/
+                            for (var i = 0; i < data.length; i++) {
+                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+                                if ($.inArray(data[i].name, titleData) > -1) {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                } else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+                                } else if (data[i].name == '鍗曟嵁鍙�') {
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, 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:120 });
+                                            break;
+                                        case 'long':
+                                        case 'Int32':
+                                        case 'Int64':
+                                        case 'double':
+                                        case 'Decimal':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+                                    }
+                                }
+                            }
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            option = {
+                                elem: '#mainTable'
+                                , toolbar: '#toolbarDemo'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 800
+                                , page: true
+                                , totalRow: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                                , done: function (res, curr, count) {
+                                    soulTable.render(this);
+                                }
+                            }
+
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+
+                            //鍒锋柊琛ㄦ牸鏁版嵁
+                            DisPlay_HideColumn();
+
+                            layer.close(ajaxLoad);
+
+                            if ($("#ColName option").length < 1) {
+                                ColFilter();
+                            }
+
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HBillNo = $("#HBillNo").val();  //鍗曟嵁鍙�
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").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 && Comparator != 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 (number==2) {
+                    if (HDate) {
+                        sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                    }
+                    if (HDate1) {
+                        sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                    }
+                }
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+
+                //鏍规嵁鐢ㄦ埛杩囨护鐢ㄦ埛鍏宠仈瀹㈡埛鐨勮褰�
+                sWhere += getSWhereByHUser();
+
+                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"));  //缁撴潫鏃ユ湡
+                $("#HBillNo").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: '鏂板' + HPageTitle
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../鎴愭湰绠＄悊/鎴愭湰璐圭敤璋冩暣鍗�/CB_ChangeMoneyBillEdit.html?OperationType=1&linterid=0&HSouceBillType='
+                    ,btn: [],
+                    end: function (index, layero, that) {
+                        //鍒锋柊椤甸潰
+                        $("#btnSearch").trigger('click');
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../鎴愭湰绠＄悊/鎴愭湰璐圭敤璋冩暣鍗�/CB_ChangeMoneyBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , btn: [],
+                        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].hmainid.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'CB_ChangeMoneyBillController/DeleteBillMain',
+                            type: "GET",
+                            data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        $("#btnSearch").trigger('click');
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                $("#btnSearch").trigger('click');
+            }
+            //#endregion
+
+            //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+            function set_CheckBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "CB_ChangeMoneyBillController/AuditCB_ChangeMoneyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶅叧闂�/鍏抽棴鏁版嵁
+            function set_CloseBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "CB_ChangeMoneyBillController/CloseCB_ChangeMoneyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍙嶄綔搴�/浣滃簾鏁版嵁
+            function set_DropBill(num) {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "CB_ChangeMoneyBill/DeleteCB_ChangeMoneyBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+            //#endregion
+
+            //#region 闅愯棌鍒楄缃�
+            function get_HideColumn() {
+                var colName = "";
+                var contentUrl = "";
+                for (var i = 1; i < option.cols[0].length; i++) {
+                    colName += option.cols[0][i]["title"] + ",";
+                }
+                var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+                var urlLen = urlStr.split('/');
+                for (var i = 0; i < urlLen.length - 4; i++) {
+                    contentUrl += "../";
+                }
+                colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+                contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+                layer.open({
+                    type: 2
+                    , skin: "layui-layer-rim" //鍔犱笂杈规
+                    , title: "闅愯棌鍒楄缃�"  //鏍囬
+                    , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+                    , shift: 2 //寮瑰嚭鍔ㄧ敾
+                    , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+                    , content: [contentUrl, "yes"]
+                    , btn: ["纭畾", "鍙栨秷"]
+                    , btn1: function (index, laero) {
+                        //鍒锋柊琛ㄦ牸鏁版嵁
+                        DisPlay_HideColumn();
+                        //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+                        layer.close(index);//鍏抽棴寮圭獥
+                    }
+                })
+            }
+            //#endregion
+            //#region 鏄剧ず鍒楁暟鎹�
+            function DisPlay_HideColumn() {
+                $.ajax({
+                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+                    type: "GET",
+                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.data.length != 0) {
+
+                            var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+                            //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+                            dataCol = data1.data[0].HGridString.split(',');
+
+                            for (var i = 0; i < option.cols[0].length - 1; i++) {
+                                var dataCols = dataCol[i].split('|');
+                                //闅愯棌鍒�
+                                if (dataCols[1] == 1) {
+                                    option.cols[0][i + 1]["hide"] = true;
+                                }
+                                //璁剧疆鍒楀
+                                if (dataCols[3] > 0) {
+                                    option.cols[0][i + 1]["width"] = dataCols[3];
+                                }
+                                //璁剧疆鍐呭瀛椾綋澶у皬
+                                if (data1.data[0].HFontSize != 0) {
+                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                                } else {
+                                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                                }
+                                //璁剧疆鍒楀
+                                //if (data1.data[0].HColumnWidth != 0) {
+                                //    option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+                                //} else {
+                                //    option.cols[0][i + 1]["width"] = "";
+                                //}
+                                //鏄剧ず鍒�
+                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+                                    option.cols[0][i + 1]["hide"] = false;
+                                }
+                                //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                                switch (dataCols[2]) {
+                                    case "L":
+                                        option.cols[0][i + 1]["align"] = "left";
+                                        break;
+                                    case "M":
+                                        option.cols[0][i + 1]["align"] = "center";
+                                        break;
+                                    case "R":
+                                        option.cols[0][i + 1]["align"] = "right";
+                                        break;
+                                }
+                            }
+
+                            //鍙栨秷鍐荤粨鍒�
+                            for (var i = 1; i < option.cols[0].length - 1; i++) {
+                                if (option.cols[0][i]["fixed"] != null) {
+                                    option.cols[0][i]["fixed"] = null;
+                                }
+                                else {
+                                    break;
+                                }
+                            }
+                            //鍐荤粨鍒�
+                            if (data1.data[0].HFixCols != 0) {
+                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+                                        data1.data[0].HFixCols += 1;
+                                    }
+                                    option.cols[0][i + 1]["fixed"] = "left";
+                                }
+                            }
+                            table.render(option);
+                        } else {
+                            table.render(option);
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                })
+            }
+            //#endregion
+
+            //#region 銆愯繃婊ゆ柟妗堛��
+
+            //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+            function 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"));
+
+                                //var HEndDate = Date.parse($("#HEndDate").val());
+                                //var HBeginDate = Format(new Date(new Date(HEndDate) - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")
+                                //$("#HBeginDate").val(HBeginDate);
+
+                                //鎵ц鏌ヨ鏂规硶
+                                // 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";
+                            //鎵ц鏌ヨ鏂规硶
+                            //get_FastQuery()
+                            form.render("select");
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //淇濆瓨鏂规
+            function set_SaveScheme() {
+                var index = layer.open()
+                //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+                var HIsClose_Manual = false;
+                //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                var Filter = document.getElementsByClassName(HClassTag);
+
+                var HFilterIdList = "";//杩囨护鏉′欢
+                var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+                var HValue = "";//杩囨护鍊�
+                var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+                if (HDefaultFilter == "") {
+                    layer.open({
+                        type: 2
+                        , area: ['40%', '80%']
+                        , title: '杩囨护鏂规'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                        , cancel: function () {
+                            // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                            HIsClose_Manual = true;
+                        }
+                        , end: function () {
+                            if (HIsClose_Manual != true) {
+                                get_FastQuery();
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        }
+                    })
+                    layer.close(index)
+                } else {
+                    //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+                    layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+                        title: "鎿嶄綔鎻愮ず",
+                        icon: 0,
+                        btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+                    }, function (index, layero) {
+                        //鏂板
+                        layer.open({
+                            type: 2
+                            , area: ['40%', '80%']
+                            , title: '杩囨护鏂规'
+                            , shift: 0//寮瑰嚭鍔ㄧ敾
+                            , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+                            , end: function () {
+                                get_FastQuery()
+                                //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                                document.getElementById("HFilterScheme_Now").style.display = "block";
+                                document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+                            }
+                        })
+                        layer.close(index)
+                    }, function (index) {
+                        //缂栬緫
+                        var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+                        HFilterIdList = "";
+                        HFilterIdLists = "";
+                        HValue = "";
+                        HElement_type = "";
+                        for (var i = 0; i < Filter_Edit.length; i++) {
+                            HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+                            HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                            HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                            HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                        }
+                        //鍘婚櫎鏈熬閫楀彿
+                        HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                        HValue = HValue.substring(0, HValue.length - 1);
+                        HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                        var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+                        //淇敼
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+                                }
+                                else {
+
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+
+                            }
+                        });
+                        layer.close(index)
+                    }, function (index) {
+                        //鍙栨秷
+                        layer.alert('鍙栨秷')
+                        layer.close(index)
+                    });
+                }
+
+            }
+
+            //璇诲彇鏂规
+            function set_ReadScheme() {
+                var HIsClose_Manual = false;
+                var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+                var HFilterIdList = "";
+                var HFilterIdLists = "";
+                var HValue = "";
+                var HElement_type = "";
+                for (var i = 0; i < Filter.length; i++) {
+                    HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+                    HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+                }
+                //鍘婚櫎鏈熬閫楀彿
+                HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+                HValue = HValue.substring(0, HValue.length - 1);
+                HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '杩囨护鏂规鍒楄〃'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+                    , cancel: function () {
+                        // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+                        HIsClose_Manual = true;
+                    }
+                    , end: function () {
+                        if (HIsClose_Manual != true) {
+                            get_FastQuery()
+                            form.render("select");
+                        }
+
+                    }
+                })
+            }
+
+            //#endregion
+
+            //#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");
+            }
+            //#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 getSWhereByHUser() {
+                var res = "";
+                $.ajax({
+                    type: "GET",
+                    async: false,
+                    url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            res = result.data;
+                        } else {
+                            res = result.data;
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function (err) {
+                        res = " and 1 = 0";
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                return res;
+            }
+            //#endregion
+
+        });
+
+            //#endregion
+
+        //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+        function HFilterScheme(obj)  //杩斿洖杩囨护鏂规
+        {
+            var HInterID = obj[0].hmainid;
+            HInterID_Choose = obj[0].hmainid;
+            $.ajax({
+                url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+                type: "GET",
+                data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        var data = data1.data;
+                        //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+                        HDefaultFilter = data[0].鏂规鍚嶇О
+                        var HRemark = data[0].澶囨敞
+                        //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+                        document.getElementById("HFilterScheme_Now").style.display = "block";
+                        document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
+                        HInterID = data[0].hmainid
+                        //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+                        for (let i = 0; i < data.length; i++) {
+                            $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+                            if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+                                $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+                            }
+                        }
+                        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"));
+
+                            //var HEndDate = Date.parse($("#HEndDate").val());
+                            //var HBeginDate = Format(new Date(new Date(HEndDate) - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")
+                            //$("#HBeginDate").val(HBeginDate);
+
+                            //鎵ц鏌ヨ鏂规硶
+                            get_FastQuery();
+                        } else {
+                            $('#HBeginDate').prop('disabled', false);
+                            $('#HEndDate').prop('disabled', false);
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+        //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html" "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
index aef0c1d..884cd43 100644
--- "a/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
+++ "b/WebTM/views/\346\210\220\346\234\254\347\256\241\347\220\206/\350\264\271\347\224\250\345\215\225\345\274\225\345\205\245/CB_ItemMoneyBill_Excel.html"
@@ -32,6 +32,48 @@
                                 </div>
                             </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="HYear" id="HYear" lay-verify="HYear">
+                                    <option value="2023">2023骞�</option>
+                                    <option value="2024">2024骞�</option>
+                                    <option value="2025">2025骞�</option>
+                                    <option value="2026" selected="selected">2026骞�</option>
+                                    <option value="2027">2027骞�</option>
+                                    <option value="2028">2028骞�</option>
+                                    <option value="2029">2029骞�</option>
+                                    <option value="2030">2030骞�</option>
+                                    <option value="2031">2031骞�</option>
+                                    <option value="2032">2032骞�</option>
+                                    <option value="2033">2033骞�</option>
+                                    <option value="2034">2034骞�</option>
+                                    <option value="2035">2035骞�</option>
+                                    <option value="2036">2036骞�</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="HMonth" id="HMonth" lay-verify="HMonth">
+                                    <option value="1">1鏈�</option>
+                                    <option value="2">2鏈�</option>
+                                    <option value="3">3鏈�</option>
+                                    <option value="4">4鏈�</option>
+                                    <option value="5">5鏈�</option>
+                                    <option value="6">6鏈�</option>
+                                    <option value="7">7鏈�</option>
+                                    <option value="8">8鏈�</option>
+                                    <option value="9">9鏈�</option>
+                                    <option value="10">10鏈�</option>
+                                    <option value="11">11鏈�</option>
+                                    <option value="12">12鏈�</option>
+                                </select>
+
+                            </div>
+                        </div>
                     </div>
 
                     <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -133,6 +175,21 @@
         function set_ClearBill() {
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            var currentDate = new Date();
+            var currentYear = currentDate.getFullYear();
+            var currentMonth = currentDate.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ+1
+
+            // 璁剧疆榛樿閫変腑褰撳墠骞翠唤
+            var yearSelect = document.getElementById('HYear');
+            if (yearSelect) {
+                yearSelect.value = currentYear;
+            }
+
+            // 璁剧疆榛樿閫変腑褰撳墠鏈堜唤
+            var monthSelect = document.getElementById('HMonth');
+            if (monthSelect) {
+                monthSelect.value = currentMonth;
+            }
         }
         //#endregion
 
@@ -155,7 +212,8 @@
                     , { field: 'HDeptID', title: 'HDeptID', hide: true }
                     , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 150 }
                     , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 150 }
-
+                    , { field: '骞翠唤', title: '骞翠唤', width: 200, hide: true }
+                    , { field: '鏈堜唤', title: '鏈堜唤', hide: true }
                     , { field: 'HEmpID', title: 'HEmpID', hide: true }
                     , { field: '鑱屽憳浠ｇ爜', title: '鑱屽憳浠ｇ爜', width: 150 }
                     , { field: '鑱屽憳', title: '鑱屽憳', width: 150 }
@@ -219,12 +277,30 @@
 
         //瀵煎叆(淇濆瓨)
         function set_AddNew(data) {
+            // 鑾峰彇閫変腑鐨勫勾浠藉拰鏈堜唤
+            var year = $("#HYear").val();
+            var month = $("#HMonth").val();
+            if (!year || !month) {
+                layer.msg("璇烽�夋嫨骞翠唤鍜屾湀浠斤紒");
+                return;
+            }
+
+            if (!option.data || option.data.length === 0) {
+                layer.msg("鏃犳暟鎹紝璇峰厛瀵煎叆鏁版嵁锛�");
+                return;
+            }
+
             var num = [];
             for (var i = 0; i < option.data.length; i++) {
                 if (option.data[i] != "") {
-                    num.push(option.data[i])
+                    var item = option.data[i];
+                    // 涓烘瘡鏉¤褰曡缃勾浠藉拰鏈堜唤锛堣鐩栧師鏈夊�硷級
+                    item["骞翠唤"] = year;
+                    item["鏈堜唤"] = month;
+                    num.push(item);
                 }
             }
+            
 
             var sSubStr = JSON.stringify(num);
             var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"] + '&鍜�' + sessionStorage["OrganizationID"];
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
index 4648f7c..77496e6 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\344\270\212\346\250\241\345\215\225/Sc_MouldUpperBillEdit.html"
@@ -457,6 +457,7 @@
                         , { field: 'HICMOInterID', title: 'HICMOInterID', hide: true }
                         , { field: 'HICMOEntryID', title: 'HICMOEntryID', hide: true }
                         , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟', edit: 'text', event: "HICMOInterID" }
+                        , { field: 'HBarCode', title: 'HBarCode', hide: true }
                         , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                     ]]
                 }
@@ -658,6 +659,7 @@
                                             , "HMouldNumber": checkStatus.data[0].妯″叿缂栧彿
                                             , "HMouldName": checkStatus.data[0].妯″叿鍚嶇О
                                             , "HMouldModel": checkStatus.data[0].妯″叿鍨嬪彿
+                                            , "HBarCode": checkStatus.data[0].鏉＄爜缂栧彿
                                         })
                                     } else {
                                         let tableBak = table.cache['mainTable']
@@ -675,6 +677,7 @@
                                                 , "HMouldNumber": checkOne.妯″叿缂栧彿
                                                 , "HMouldName": checkOne.妯″叿鍚嶇О
                                                 , "HMouldModel": checkOne.妯″叿鍨嬪彿
+                                                , "HBarCode": checkOne.鏉＄爜缂栧彿
                                             })
                                         }                                        
 
@@ -692,6 +695,7 @@
                                             , "HMouldNumber": optionData[0].妯″叿缂栧彿
                                             , "HMouldName": optionData[0].妯″叿鍚嶇О
                                             , "HMouldModel": optionData[0].妯″叿鍨嬪彿
+                                            , "HBarCode": optionData[0].鏉＄爜缂栧彿
                                         })
                                         optionData = []
                                     }
@@ -851,7 +855,7 @@
                         for (var i = 0; i < d.data.length; i++) {
                             rowdata.push(
                                 {
-                                    "HMouldID": d.data[i].HMouldID, "HMouldNumber": d.data[i].妯″叿缂栫爜, "HMouldName": d.data[i].妯″叿鍚嶇О, "HMouldModel": d.data[i].妯″叿瑙勬牸, "HQty": d.data[i].鏁伴噺
+                                    "HMouldID": d.data[i].HMouldID, "HMouldNumber": d.data[i].妯″叿缂栫爜, "HMouldName": d.data[i].妯″叿鍚嶇О, "HMouldModel": d.data[i].妯″叿瑙勬牸, "HQty": d.data[i].鏁伴噺, "HBarCode": d.data[i].鏉″舰鐮�
                                     , "HSourceID": d.data[i].HSourceID, "HSourceName": d.data[i].鐢熶骇璧勬簮, "HICMOInterID": d.data[i].HICMOInterID, "HICMOEntryID": d.data[i].HICMOEntryID, "HICMOBillNo": d.data[i].HICMOBillNo
                                 }
                             )
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 2831e66..e0966d0 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"
@@ -59,13 +59,13 @@
                                 </div>
 
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍣ㄥ叿缂栧彿</label>
+                                    <label class="layui-form-label">妯″叿缂栧彿</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍣ㄥ叿鍚嶇О</label>
+                                    <label class="layui-form-label">妯″叿鍚嶇О</label>
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
                                     </div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index 02b61de..42b10ff 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -924,7 +924,12 @@
                 if (Source) {
                     sWhere += " and 鐢熶骇璧勬簮 like '%" + Source + "%'";
                 }
-                sWhere += " and 鍒跺崟浜� !='鑷姩鐢熸垚'";
+                if(sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�"){
+
+                }else {
+                    sWhere += " and 鍒跺崟浜� !='鑷姩鐢熸垚'";
+                }
+
                 //if (HOrgID) {
                 //    sWhere += " and HOrgID = '" + HOrgID + "'";
                 //}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 8f968cd..f0b658d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -815,7 +815,7 @@
                         , { field: 'HResult', title: '妫�娴嬬粨鏋�', width: 100, templet: "#HResult" }
                         , { field: 'HIsRequired', title: '鏄惁蹇呭綍', width: 100, templet: "#HIsRequired" }
                         , { field: 'HRemark', title: '澶囨敞', width: 100, edit: 'text' }
-                        // , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 70 }
                     ]]
                 }
 
@@ -1461,14 +1461,19 @@
                     var field = obj.event; // 鑾峰彇瀛楁
                     var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
                     var cell = obj.tr.find('td[data-field="' + field + '"]'); // 鑾峰彇鍗曞厓鏍煎厓绱�
-
-                    if (row['HRemark'] === '璁惧閲囬泦') {
-                        layer.msg('姝ゅ崟鍏冩牸鐨勫�间负鈥滆澶囬噰闆嗏��,鏃犳硶缂栬緫'); // 鎻愮ず淇℃伅
-                        cell.removeAttr('contenteditable'); // 纭繚鍗曞厓鏍间笉琚紪杈�
+                    if (sessionStorage["Organization"] == "鏉窞鏂帿灏旂鎬ф潗鏂欐湁闄愬叕鍙�") {
+                        if (row['HRemark'] === '璁惧閲囬泦') {
+                            layer.msg('姝ゅ崟鍏冩牸鐨勫�间负鈥滆澶囬噰闆嗏��,鏃犳硶缂栬緫'); // 鎻愮ず淇℃伅
+                            cell.removeAttr('contenteditable'); // 纭繚鍗曞厓鏍间笉琚紪杈�
+                        } else {
+                            cell.attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
+                            cell.focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
+                        }
                     } else {
                         cell.attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
                         cell.focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
                     }
+                   
                 }
             });
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
index 8507d2d..aad33a7 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam.html"
@@ -42,26 +42,26 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
+                                        <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="HDate1" style="width:190px;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                                     </div>
                                 </div>
 
-                                <div class="layui-row">
+                                <div class="layui-row" style="margin-top:10px;margin-bottom:10px">
                                     <div class="layui-inline">
                                         <label class="layui-form-label">璁惧缂栫爜</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HSourceCode" id="HSourceCode" style="width:190px;">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">宸ヨ壓鍙傛暟鍚嶇О</label>
+                                    <div class="layui-inline" style="width:400px">
+                                        <label class="layui-form-label" style="width:90px">宸ヨ壓鍙傛暟鍚嶇О</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HTechParamName" id="HTechParamName" style="width:190px;">
                                         </div>
@@ -72,98 +72,12 @@
                                     </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">
-                                </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>
+                        <div id="page"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -194,51 +108,20 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var Name = "MouldProdInHouseCellWidth";
-            var HModName = "Cg_ContractBillList";
-            var HBillType = "1100";
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "1100";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion
+            var HModName = "Sb_EquipMentCollectionTechParam_Temp";
 
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-            var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭", "鍚屾鏍囪"];
-            //#endregion
-
-            //#region 銆愯繃婊ゆ柟妗堛��
-
-            //杩囨护鏉′欢鐨刢lass绫�
-            var HClassTag = "ForFilteringSchemes";
-            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "璁惧宸ヨ壓鍙傛暟鏁伴噰";
-            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
-            window.HDefaultFilter = "";
-            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
-            window.HInterID_Choose = 0;
-
+            var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭","鍚屾鏍囪"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             set_ClearBill();
             //#endregion
-            //鑾峰彇缁勭粐
-            Organ();
 
             //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 switch (obj.event) {
-                    //鏂板鎸夐挳
-                    case 'btn-Add': set_AddNew();
-                        break;
-                    //缂栬緫鎸夐挳
-                    case 'btn-Edit': set_ShowBill();
-                        break;
-                    //鍒犻櫎鎸夐挳
-                    case 'btn-Delete': set_DeleteBill();
-                        break;
                     //鍒锋柊
                     case 'get_Refresh': set_Refresh();
                         break;
@@ -248,97 +131,36 @@
                 };
             });
 
-            //閲嶆柊鍚屾鎸夐挳
-            form.on('submit(btnResCnz)', function (data) {
-                set_ResCnz();
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                optionPage.curr = 1;
+                get_FastQuery();
             });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                optionPage.curr = 1;
                 set_ClearQuery();
             });
 
-            //鑾峰彇缁勭粐
-            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");
-                    }
-                })
-            }
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
-            });
-
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '渚涘簲鍟嗗垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/SupplierInformation.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].HName);
-                        $("#HSupID").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('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
                 if (HInitTimeCycle != -1) {
-                    $('#HDate').prop('disabled', true);
-                    $('#HDate1').prop('disabled', true);
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
 
-                    $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                    $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#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 {
-                    $('#HDate').prop('disabled', false);
-                    $('#HDate1').prop('disabled', false);
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
                 }
             });
 
@@ -349,21 +171,19 @@
                 //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 if (HInitTimeCycle != -1) {
-                    $('#HDate').prop('disabled', true);
-                    $('#HDate1').prop('disabled', true);
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
                 } else {
-                    $('#HDate').prop('disabled', false);
-                    $('#HDate1').prop('disabled', false);
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
                 }
                 //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
-                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#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(table, option, 1);
-                //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
-              /*  get_DefaultModule();*/
             }
 
             //鍒濆鍖栬〃鏍�
@@ -371,253 +191,134 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
+                    , height: 'full-110'
+                    , page: false
                     , totalRow: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
+                    , limits: [50, 100]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 200
                     , done: function (res, curr, count) {
                         soulTable.render(this);
                     }
                 };
-                ////璁剧疆鍒楀
-                //var colWidth = getColumnsWidth();
-                //if (colWidth == "" || colWidth == []) {
 
-                //}
-                //else {
-                //    $.each(columns, function (x, m) {
-                //        m["width"] = colWidth[x];
-                //    });
-                //}
-            }
-            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-
-                //鍗曟嵁鍙疯秴閾炬帴
-                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
-                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
-                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
-                        , area: ['100%', '100%']
-                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
-                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: './Add_Edit_Cg_ContractBillList.html?OperationType=3&linterid='+linterid+'&HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
-                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
-                        end: function () {  //褰撳叧闂椂璋冪敤
-                            get_FastQuery(table, option);
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 1000, 2000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            console.log(obj)
+                            get_FastQuery();
                         }
-                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
+                    }
                 }
-            });
-             //#endregion
-            //鍔犺浇缃戞牸
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
+                laypage.render(optionPage);
+            }
+
+            //#region 鏌ヨ(涓昏〃)-鍒嗛〉
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + '/EquipMentCollection/list',
+                    url: GetWEBURL() + '/Sb_EquipMentReport/Sb_EquipMentCollectionTechParam_Page',
                     type: "GET",
-                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
+                    async: false,
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
                             var data = [];
-                            var col = [];                           
+                            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 });
+                                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++) {                                
+                            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: '鍗曟嵁鍙�', 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 HH:mm:ss')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:MM:ss')}}</div>", width: 200 });
+                                            break;
+                                        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
-                                , height: 800
-                                , page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
-                            }
+                            };
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
                             table.render(option);
-                            //涓嬫媺鍒楄〃
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "1100";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
-                            layer.close(ajaxLoad);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.close(ajaxLoad);
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
+                            option.data = [];
+                            table.render(option);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+                layer.close(ajaxLoad);
             }
-            //鏂板
-            function set_AddNew() {
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板' + HPageTitle,
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['100%', '100%'],
-                    maxmin: true,
-                    content: '../../璁惧绠＄悊/璁惧鎶ヨ〃/缂栬緫椤甸潰/Edit_Sb_EquipMentCollectionTechParam.html?OperationType=1&linterid=',
-                    
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        get_FastQuery(table, option);
-                    },
-                    success: function (layero, index) {
-                    }
-                });
-            }
-         
+            //#endregion
+
+
+
             //蹇�熻繃婊�
-            function get_FastQuery(table, option,number) {
+            function get_FastQuery() {
                 var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
-                var HTechParamName = $("#HTechParamName").val();//璁惧缂栫爜
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").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 && Comparator != 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;
-                }
+                var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+                var HTechParamName = $("#HTechParamName").val(); //宸ヨ壓鍙傛暟鍚嶇О
                 if (HSourceCode) {
-                    sWhere += " and 璁惧缂栫爜 like '%" + HSourceCode + "%'";
+                    sWhere += " and HSourceCode like '%" + HSourceCode + "%'";
                 }
                 if (HTechParamName) {
-                    sWhere += " and 宸ヨ壓鍙傛暟鍚嶇О like '%" + HTechParamName + "%'";
+                    sWhere += " and HTechParamName like '%" + HTechParamName + "%'";
                 }
-                if (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) >= '" + HBeginDate + "'";
                 }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) <= '" + HEndDate + "'";
                 }
-                sWhere += addSWhereByOpenType();
-
-                sWhere += "     order by  鏃ユ湡  desc";
-
-                var index = layer.load(0);
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
@@ -625,20 +326,11 @@
             //閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HSourceCode").val("");
-                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
-                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));  //缁撴潫鏃ユ湡
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
+                $("#HTechParamName ").val("");
+                $("#HBeginDate").val("");
+                $("#HEndDate").val("");
                 sWhere = "";
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
             }
 
             //#endregion
@@ -681,124 +373,10 @@
                 $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                 form.render('select');
 
-                $("#HInitTimeCycle").val("4");
+                $("#HInitTimeCycle").val("0");
             }
             //#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);
-                                }
-                            }
-
-                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
-                            if (HInitTimeCycle != -1) {
-                                $('#HDate').prop('disabled', true);
-                                $('#HDate1').prop('disabled', true);
-
-                                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
-
-
-                                //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
-                            } else {
-                                $('#HDate').prop('disabled', false);
-                                $('#HDate1').prop('disabled', false);
-                            }
-
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
-                        } else {
-                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
-                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
-                            document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //#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 (openType == 2) {
-                    addSWhere = "";
-                }
-                return addSWhere;
-            }
-            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
index 075e059..9b6ae51 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/Sb_EquipMentCollectionTechParam_Temp.html"
@@ -53,15 +53,15 @@
                                     </div>
                                 </div>
 
-                                <div class="layui-row">
+                                <div class="layui-row" style="margin-top:10px;margin-bottom:10px">
                                     <div class="layui-inline">
                                         <label class="layui-form-label">璁惧缂栫爜</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HSourceCode" id="HSourceCode" style="width:190px;">
                                         </div>
                                     </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">宸ヨ壓鍙傛暟鍚嶇О</label>
+                                    <div class="layui-inline" style="width:400px">
+                                        <label class="layui-form-label" style="width:90px">宸ヨ壓鍙傛暟鍚嶇О</label>
                                         <div class="layui-input-block">
                                             <input type="text" class="layui-input ForFilteringSchemes" name="HTechParamName" id="HTechParamName" style="width:190px;">
                                         </div>
@@ -71,100 +71,13 @@
                                         <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>                              
                                 <div class="layui-colla-content">
-                                </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>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div id="page"></div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
@@ -195,32 +108,12 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            var Name = "MouldProdInHouseCellWidth";
-            var HModName = "Cg_ContractBillList";
-            var HBillType = "1100";
-            //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
-            var HModuleType = "1100";
-            //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-            //#endregion
-
+            var HModName = "Sb_EquipMentCollectionTechParam_Temp";
+          
             //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             var titleData = ["HItemID", "宸ヨ壓鍙傛暟", "宸ュ簭","鍚屾鏍囪"];
             //#endregion
-
-            //#region 銆愯繃婊ゆ柟妗堛��
-
-            //杩囨护鏉′欢鐨刢lass绫�
-            var HClassTag = "ForFilteringSchemes";
-            //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
-            window.HModuleName = "璁惧宸ヨ壓鍙傛暟鏁伴噰";
-            //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
-            window.HDefaultFilter = "";
-            //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
-            window.HInterID_Choose = 0;
-
-            //#endregion
-
+            
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
             set_ClearBill();
             //#endregion
@@ -237,60 +130,21 @@
                         break;
                 };
             });
-
-            //閲嶆柊鍚屾鎸夐挳
-            form.on('submit(btnResCnz)', function (data) {
-                set_ResCnz();
+            
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                optionPage.curr = 1;
+                get_FastQuery();
             });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                optionPage.curr = 1;
                 set_ClearQuery();
             });
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
-            });
-
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
-            form.on('submit(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '渚涘簲鍟嗗垪琛�',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/SupplierInformation.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].HName);
-                        $("#HSupID").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('select(HInitTimeCycle)', function (data) {
                 var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
@@ -337,234 +191,134 @@
                 option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
-                    , height: 'full-50'
-                    , page: true
+                    , height: 'full-110'
+                    , page: false
                     , totalRow: true
-                    , cellMinWidth: 90
-                    , limit: 50
-                    , limits: [50, 500, 5000, 20000]
+                    , limits: [50, 100]
+                    , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                    , cellMinWidth: 200
                     , done: function (res, curr, count) {
                         soulTable.render(this);
-                    }
+                    }                   
                 };
-                ////璁剧疆鍒楀
-                //var colWidth = getColumnsWidth();
-                //if (colWidth == "" || colWidth == []) {
 
-                //}
-                //else {
-                //    $.each(columns, function (x, m) {
-                //        m["width"] = colWidth[x];
-                //    });
-                //}
-            }
-            //#region  鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-
-                //鍗曟嵁鍙疯秴閾炬帴
-                if (obj.event == '鍗曟嵁鍙�') {                  //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
-                    var linterid = data.hmainid.toString();    //澹版槑鍙橀噺linterid 涓� data.hmainid
-                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                    layer.open({                //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
-                        type: 2                         //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
-                        , area: ['100%', '100%']
-                        , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
-                        , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: './Add_Edit_Cg_ContractBillList.html?OperationType=3&linterid='+linterid+'&HSouceBillType=0&closeType=1'  //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
-
-                        , resize: false,  //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
-                        end: function () {  //褰撳叧闂椂璋冪敤
-                            get_FastQuery(table, option);
+                optionPage = {
+                    elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+                    count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+                    limit: 50,
+                    limits: [50, 500, 1000, 2000],
+                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+                    jump: function (obj, first) {
+                        //棣栨涓嶆墽琛�
+                        if (!first) {
+                            //do something
+                            console.log(obj)
+                            get_FastQuery();
                         }
-                        , cancel: function () {  //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
+                    }
                 }
-            });
-             //#endregion
-            //鍔犺浇缃戞牸
-            function get_Display(sWhere) {
-                var ajaxLoad = layer.load();
+                laypage.render(optionPage);
+            }
+
+            //#region 鏌ヨ(涓昏〃)-鍒嗛〉
+            function get_DisplayPage(sWhere) {
+                var ajaxLoad = layer.load();//閬僵
                 $.ajax({
-                    url: GetWEBURL() + 'EquipMentCollectionTemp/list',
+                    url: GetWEBURL() + '/Sb_EquipMentReport/Sb_EquipMentCollectionTechParam_Temp_Page',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
                     success: function (data1) {
-                        if (data1.count == 1) {
+                        option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+                        if (data1.code == 1) {
                             var data = [];
-                            var col = [];                           
+                            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 });
+                                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++) {                                
+                            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: '鍗曟嵁鍙�', 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 HH:mm:ss')}}</div>", width: 200 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:MM:ss')}}</div>", width: 200 });
+                                            break;
+                                        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
-                                , height: 800
-                                , page: true
-                                , totalRow: true
-                                , cellMinWidth: 90
-                                , limit: 50
-                                , limits: [50, 500, 5000, 20000]
                                 , done: function (res, curr, count) {
                                     soulTable.render(this);
                                 }
-                            }
+                            };
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
                             table.render(option);
-                            //涓嬫媺鍒楄〃
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
-                                ColFilter();
-                            }
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "1100";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
 
-                            layer.close(ajaxLoad);
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
-                            layer.close(ajaxLoad);
+                            optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+                            laypage.render(optionPage);
+                            option.data = [];
+                            table.render(option);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+                layer.close(ajaxLoad);
             }
+            //#endregion
+
 
           
             //蹇�熻繃婊�
-            function get_FastQuery(table, option,number) {
+            function get_FastQuery() {
                 var HSourceCode = $("#HSourceCode").val();//璁惧缂栫爜
                 var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
-                var HTechParamName = $("#HTechParamName").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 && Comparator != 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;
-                }
+                var HTechParamName = $("#HTechParamName").val(); //宸ヨ壓鍙傛暟鍚嶇О               
                 if (HSourceCode) {
-                    sWhere += " and 璁惧缂栫爜 like '%" + HSourceCode + "%'";
+                    sWhere += " and HSourceCode like '%" + HSourceCode + "%'";
                 }
                 if (HTechParamName) {
-                    sWhere += " and 宸ヨ壓鍙傛暟鍚嶇О like '%" + HTechParamName + "%'";
+                    sWhere += " and HTechParamName like '%" + HTechParamName + "%'";
                 }
                 if (HBeginDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) >= '" + HBeginDate + "'";
                 }
                 if (HEndDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
+                    sWhere += " and CONVERT(varchar(100),HDate, 23) <= '" + HEndDate + "'";
                 }
-                sWhere += addSWhereByOpenType();
-
-                sWhere += "     order by  鏃ユ湡  desc";
-                var index = layer.load(0);
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
                 //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 sWhere = "";
             }
@@ -574,19 +328,9 @@
                 $("#HSourceCode").val("");
                 $("#HTechParamName ").val("");
                 $("#HBeginDate").val("");
-                $("#HEndDate").val("");
-                $("#ColContent").val("");
-                $("#ColName").val("0");
-                $("#Comparator").val("0");
-                form.render('select');
-                $("#ColContent1").val("");
-                $("#ColName1").val("0");
-                $("#Comparator1").val("0");
-                $("#ColContent2").val("");
-                $("#ColName2").val("0");
-                $("#Comparator2").val("0");
+                $("#HEndDate").val("");              
                 sWhere = "";
-                get_Display(sWhere);
+                get_DisplayPage(sWhere);
             }
 
             //#endregion
@@ -633,120 +377,6 @@
             }
             //#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);
-                                }
-                            }
-
-                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
-                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
-                            if (HInitTimeCycle != -1) {
-                                $('#HBeginDate').prop('disabled', true);
-                                $('#HEndDate').prop('disabled', true);
-
-                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
-                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
-
-
-                                //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
-                            } else {
-                                $('#HBeginDate').prop('disabled', false);
-                                $('#HEndDate').prop('disabled', false);
-                            }
-
-                            //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            form.render("select");
-                        } else {
-                            //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
-                            //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
-                            document.getElementById("HFilterScheme_Now").style.display = "none";
-                            ////鎵ц鏌ヨ鏂规硶
-                            //get_FastQuery()
-                            //form.render("select");
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //#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 (openType == 2) {
-                    addSWhere = "";
-                }
-                return addSWhere;
-            }
-            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/\347\274\226\350\276\221\351\241\265\351\235\242/Edit_Sb_EquipMentCollectionTechParam.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/\347\274\226\350\276\221\351\241\265\351\235\242/Edit_Sb_EquipMentCollectionTechParam.html"
deleted file mode 100644
index 51825c1..0000000
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\212\245\350\241\250/\347\274\226\350\276\221\351\241\265\351\235\242/Edit_Sb_EquipMentCollectionTechParam.html"
+++ /dev/null
@@ -1,380 +0,0 @@
-锘�<!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 http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
-    <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all">
-    <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all">
-    <style>
-        .layui-form-item .layui-input-inline {
-            width: 50%;
-        }
-
-        .layui-inline {
-            width: 290px;
-        }
-
-        .layui-form-item .layui-inline {
-            margin-right: 0px;
-        }
-
-        .layui-input, .layui-textarea {
-            width: 124%;
-        }
-    </style>
-
-</head>
-<body>
-    <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
-            <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div class="layui-card-header">
-                        <div class="layui-btn-group">
-                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                        </div>
-
-                    </div>
-                    <h1 style="text-align:center;height:50px;line-height:50px"><b>璁惧宸ヨ壓鍙傛暟鏁伴噰璁剧疆</b></h1>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-inline">
-                                <label class="layui-form-label">璁惧缂栫爜</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HSourceCode" id="HSourceCode" lay-verify="HSourceCode" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-
-                            <div class="layui-inline">
-                                <label class="layui-form-label">宸ヨ壓鍙傛暟鍊�</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HResult" id="HResult" lay-verify="HResult" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-
-                            <div class="layui-inline">
-                                <label class="layui-form-label">宸ュ簭</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HProcNumber" id="HResult" lay-verify="HResult" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鏁伴噺</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HCount" id="HCount" lay-verify="HCount" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-
-                        </div>
-                        
-                        <div class="layui-row" style="margin-bottom:5px">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">宸ヨ壓鍙傛暟</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HTechParamName" id="HTechParamName" style="background-color: #efefef4d; width: 64%; display: inline-block;" readonly>
-                                    <input type="hidden" name="HTechParamID" id="HTechParamID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchPss" id="btnSearchPss" style="padding: 0 10px;float: right;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="layui-row" style="margin-bottom:5px">
-                            <label class="layui-form-label">鍚屾鏍囪</label>
-                            <div class="layui-input-block">
-                                <input type="checkbox" name="HFlag" id="HFlag" lay-skin="primary" title="">
-                            </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 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/layui/lay/modules/util.js"></script>
-    <script src="../../../../layuiadmin/PubCustom.js"></script>
-    <script>
-        //鑾峰彇鍙傛暟
-        var params = get_UrlVars();
-        if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 1;//鎿嶄綔绫诲瀷
-        } else {
-            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
-            var linterid = params[params[1]];//婧愬崟id
-        }
-
-        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 = "";
-            //#endregion
-
-            var option;
-            //#region 杩涘叆椤甸潰鏃㈠姞杞�
-            $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-            //鍒ゆ柇鎿嶄綔绫诲瀷
-            if (OperationType == 1) {//鏃犳簮鍗�
-                set_AddFNew();
-            }
-
-            else if (OperationType == 2) {//鏂板娴佹按鍙�
-                setInitHCurName()
-                var HSupTypeID = params[params[2]];//绫诲瀷id
-                var HSupClsName = params[params[3]];//绫诲瀷鍚嶇О
-                console.log(HSupClsName)
-                setHNumber(HSupTypeID);
-                $("#HNumber").attr("readonly", false);
-                $("#HSupTypeID").val(HSupTypeID);
-                $("#HSupClsName").val(decodeURIComponent(HSupClsName));
-                //鍒濆鍖栬〃
-                get_InitGrid();
-            }
-
-            else if (OperationType == 3) {//缂栬緫
-                $("#HInterID").val(linterid);
-                set_EditFromGrid();
-                //鍒濆鍖栬〃
-                get_InitGrid();
-            }
-            else {
-                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
-            }
-            //#endregion
-
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
-            //閫夋嫨閲囪喘鏂瑰紡鎸夐挳
-            form.on('submit(btnSearchPss)', function () {
-                layer.open({
-                    type: 2//寮圭獥绫诲瀷
-                    , skin: 'layui-layer-rim' //鍔犱笂杈规
-                    , area: ['90%', '90%']//澶у皬
-                    , title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
-                    , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HTechParamName").val(checkStatus.data[0].宸ヨ壓鍙傛暟鍚嶇О);
-                        $("#HTechParamID").val(checkStatus.data[0].HItemID);
-                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
-                    }
-                    , btn2: function (index, layero) { }
-                })
-            });
-
-            //淇濆瓨
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-                var ModRightNameAdd = 'Gy_EquipMentCollect_Edit';
-                var user = sessionStorage["HUserName"];
-
-                var isEndCheck = document.getElementById("HFlag").checked;
-                isEndCheck == true ? data.field.HFlag = 'true' : data.field.HFlag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
-                var oMain = JSON.stringify(data.field)
-                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
-                    if (OperationType == "3") {
-                        $.ajax({
-                            type: "POST",
-                            url: GetWEBURL() + "/EquipMentCollection/save",
-                            async: true,
-                            data: { "oMain": sBillModeify },
-                            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 {
-                                    layer.alert(data.Message);
-                                    console.log("Reason" + sBillModeify + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-                                layer.alert("閿欒:" + err.Message);
-                                console.log("Reason" + sBillModeify);
-                            }
-                        });
-                    }
-                    else {
-                        console.log(oMain);
-                        console.log($("#HItemID").val);
-                        $.ajax({
-                            type: "POST",
-                            url: GetWEBURL() + "/EquipMentCollection/save",
-                            async: true,
-                            data: { "oMain": oMain},
-                            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 {
-                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        });
-                    }
-            });
-
-            //閫�鍑�
-            form.on('submit(Exit)', function () {
-                if (linterid == undefined) {
-                    //鍏抽棴椤电
-                    Pub_Close(2);
-                }
-                else {
-                    //鍏抽棴椤电
-                    Pub_Close(1);
-                }
-            });
-
-            //#endregion
-
-            //#region 姝ら〉闈㈡墍鏈夋柟娉�
-            //鍒濆鍖栭〉闈�
-            function set_AddFNew() {
-                $.ajax({
-                    url: GetWEBURL() + "EquipMentCollection/GetMAXBillID",
-                    type: "GET",
-                    data: {},
-                    success: function (d) {
-                        console.log(d.data[0].HItemID)
-                        $("#HItemID").val(d.data[0].HItemID);
-                    }
-                });
-            }
-
-            //娴佹按鍙锋柊澧炶幏鍙栫紪鐮�
-            function setHNumber(TypeID){
-                var ajaxLoad = layer.load();
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_Supplier/getMaxNum',
-                    type: "GET",
-                    data: { "HSupTypeID": TypeID, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] },
-                    success: function (data1) {
-                        if (data1.data != null) {
-                            layer.close(ajaxLoad);
-                            $("#HNumber").val(data1.data)
-                        } else {
-                            layer.close(ajaxLoad);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(ajaxLoad);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-            }
-
-            //缂栬緫椤甸潰鍔犺浇
-            function set_EditFromGrid() {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Supplier/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HCreateOrgID").val(d.data[0].HCREATEORGID);
-                        $("#HCreateOrg").val(d.data[0].鍒涘缓缁勭粐);
-                        $("#HUseOrgID").val(d.data[0].HUSEORGID);
-                        $("#HUseOrg").val(d.data[0].浣跨敤缁勭粐);
-                        $("#HNumber").val(d.data[0].缂栫爜);
-                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
-                        $("#HShortName").val(d.data[0].绠�绉�);
-                        $("#HAddress").val(d.data[0].鍦板潃);
-                        $("#HLinkMan").val(d.data[0].鑱旂郴浜�);
-                        $("#HLinkPhone").val(d.data[0].鑱旂郴鐢佃瘽);
-                        $("#HMobilePhone").val(d.data[0].鎵嬫満);
-                        $("#HFax").val(d.data[0].浼犵湡);
-                        $("#HPostalCode").val(d.data[0].閭紪);
-                        $("#HEmail").val(d.data[0].鐢靛瓙閭欢);
-                        $("#HCorMan").val(d.data[0].娉曚汉浠ｈ〃);
-                        $("#HBank").val(d.data[0].寮�鎴烽摱琛�);
-                        $("#HTaxNum").val(d.data[0].绋庡姟鐧昏鍙�);
-                        $("#HEnglishName").val(d.data[0].鑻辨枃鍚嶇О);
-                        $("#HEnglishAddress").val(d.data[0].鑻辨枃鍦板潃);
-                        $("#HCountry").val(d.data[0].鍥藉);
-                        $("#HAreaID").val(d.data[0].鍦板尯ID);
-                        $("#HAreaName").val(d.data[0].鍦板尯鍚嶇О);
-                        $("#HTaxRate").val(d.data[0].澧炲�肩◣鐜�);
-                        $("#HCurID").val(d.data[0].榛樿璐у竵ID);
-                        $("#HCurName").val(d.data[0].榛樿璐у竵);
-                        $("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
-                        $("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
-                        $("#HBankAccount").val(d.data[0].閾惰璐﹀彿);
-                        $("#HName").val(d.data[0].鍚嶇О);
-                        $("#HPSStyleID").val(d.data[0].閲囪喘鏂瑰紡ID);
-                        $("#HPSStyleName").val(d.data[0].閲囪喘鏂瑰紡鍚嶇О);
-                        $("#HRemark").val(d.data[0].澶囨敞);
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
-                        $('#HMaterClass').find("option[value='" + d.data[0].渚涜揣鏉愭枡绫诲埆 + "']").attr("selected", true);
-                        $('#HSupTypeID').val(d.data[0].HSupTypeID);
-                        $('#HSupClsName').val(d.data[0].渚涘簲鍟嗗垎绫�);
-                        form.render('select');
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-
-                        option.data = d.list[0]["Gy_Supplier_PayPlan"];
-                        table.render(option);
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-                });
-            }
-
-            //#endregion
-
-        });
-                //浠ヤ笂涓簂ayui妯″潡
-    </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\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 339935b..14e417d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -44,7 +44,7 @@
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" 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="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-BF" lay-filter="btn-Print" id="btn-Print">鎵撳嵃</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-Print" lay-filter="btn-Print" id="btn-Print">鎵撳嵃</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage">姹囨姤</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-RK" lay-filter="btn-RK" id="btn-RK">鍏ュ簱</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-BF" lay-filter="btn-BF" id="btn-BF">鎶ュ簾</button>
@@ -2123,38 +2123,47 @@
                     data: { "sWhere": sWhere },
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            if (data.data && data.data.length != 0) {
+                                console.log("鑾峰彇鍒版暟鎹潯鏁�:", data.data.length);
 
-                            if (data.data.length != 0) {
-                                var dataPrint = [];
+                                // 浣跨敤甯﹀欢杩熺殑寰幆鎵撳嵃
                                 for (var i = 0; i < data.data.length; i++) {
-                                    dataPrint.push(data.data[i])
+                                    // 寤惰繜鎵撳嵃姣忔潯鏁版嵁锛岄伩鍏嶆墦鍗版満鍐茬獊
+                                    (function (index) {
+                                        setTimeout(function () {
+                                            var singleItem = data.data[index];
+                                            console.log("姝ｅ湪鎵撳嵃绗�" + (index + 1) + "涓潯鐮�:", singleItem.鍗曟嵁鍙�);
+
+                                            var singleData = [singleItem];
+                                            var Customer = {
+                                                "Table": singleData
+                                            };
+
+                                            var args = {
+                                                type: "print",
+                                                showOptionDlg: false,
+                                                report: urlAddRandomNo("../../grf/娉ㄥ绠辨潯鐮丣SON.grf"),
+                                                data: Customer
+                                            };
+
+                                            webapp_ws_ajax_run(args);
+                                        }, index * 3000); // 姣忔潯鏁版嵁闂撮殧500姣
+                                    })(i);
                                 }
 
-                                var Customer = {
-                                    "Table": dataPrint
-                                }
-                                var args = {
-                                    type: "print",
-                                    showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
-                                    report: urlAddRandomNo("../../grf/娉ㄥ绠辨潯鐮丣SON.grf"),
-                                    data: Customer
-                                };
+                                console.log("宸插彂閫�" + data.data.length + "涓墦鍗颁换鍔�");
 
-                                console.log(data.data[0].鍗曟嵁鍙�);
-
-                                webapp_ws_ajax_run(args);
-
-                                if (rest.length <= num + 1) {
+                                // 鍘熸潵鐨勮鏁板櫒閫昏緫
+                                if (rest && rest.length <= num + 1) {
                                     num = 0;
                                     clearInterval(time);
-                                } else {
+                                } else if (rest) {
                                     num++;
                                 }
 
                             } else {
                                 layer.msg("鏌ユ棤鏁版嵁!");
                             }
-
                         }
                         else {
                             layer.msg(data.Message, { icon: 5 });
@@ -2165,7 +2174,6 @@
                         layer.msg("閿欒:" + err, { icon: 5 });
                     }
                 })
-
             }
             //#endregion
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index 3b0ce6b..4f3e496 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.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>
@@ -22,6 +23,7 @@
     <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
     <script src="../../../layuiadmin/MESLanguage.js"></script>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -34,11 +36,12 @@
                                     <div class="layui-inline">
                                         <span id="BT_GD">鏇村</span>
                                     </div>
-                                </div>                          
+                                </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label" id="BT_HStatus">鐘舵��</label>
                                     <div class="layui-input-block">
-                                        <select name="HStatus" id="HStatus" lay-filter="HStatus" style="width:190px;" class="ForFilteringSchemes">
+                                        <select name="HStatus" id="HStatus" lay-filter="HStatus" style="width:190px;"
+                                            class="ForFilteringSchemes">
                                             <option value="-1" selected="selected">鍏ㄩ儴</option>
                                             <option value="0">鏈鏍�</option>
                                             <option value="1">宸插鏍�</option>
@@ -58,29 +61,36 @@
                                     <div class="layui-inline">
                                         <label class="layui-form-label" id="BT_HInitTimeCycle">鏃ユ湡闂撮殧</label>
                                         <div class="layui-input-block">
-                                            <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
+                                            <select name="HInitTimeCycle" id="HInitTimeCycle"
+                                                class="ForFilteringSchemes" lay-filter="HInitTimeCycle"
+                                                style="width:190px;">
                                             </select>
                                         </div>
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label" id="BT_HBeginDate">寮�濮嬫棩鏈�</label>
                                         <div class="layui-input-block">
-                                            <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
+                                            <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate"
+                                                style="width:190px;">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label" id="BT_HEndDate">缁撴潫鏃ユ湡</label>
                                         <div class="layui-input-block">
-                                            <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
+                                            <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                                style="width:190px;">
                                         </div>
                                     </div>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <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>
                                 <div class="layui-colla-content">
@@ -91,58 +101,75 @@
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;" id="BT_HWorkBillNo">浠诲姟鍗曞彿</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HWorkBillNo">浠诲姟鍗曞彿</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HWorkBillNo" id="HWorkBillNo">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HWorkBillNo" id="HWorkBillNo">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;" id="BT_HBillNo">鍗曟嵁鍙�</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HBillNo">鍗曟嵁鍙�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
+                                                <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;" id="BT_HProcExchBillNo">宸ュ簭娴佽浆鍗″彿</label>
+                                            <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 ForFilteringSchemes" name="HProcExchBillNo" id="HProcExchBillNo">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HProcExchBillNo" id="HProcExchBillNo">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;" id="BT_HNumber">浜у搧浠ｇ爜</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HNumber">浜у搧浠ｇ爜</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
+                                                <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;" id="BT_HName">褰撳墠宸ュ簭</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HName">褰撳墠宸ュ簭</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+                                                <input type="text" class="layui-input ForFilteringSchemes" name="HName"
+                                                    id="HName">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="" id="BT_checkHWasterQty">鎶ュ簾鏁伴噺涓嶄负0</label>
+                                            <label class="layui-form-label" style=""
+                                                id="BT_checkHWasterQty">鎶ュ簾鏁伴噺涓嶄负0</label>
                                             <div class="layui-input-block">
-                                                <input type="checkbox" name="checkHWasterQty" class="ForFilteringSchemes" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="">
+                                                <input type="checkbox" name="checkHWasterQty"
+                                                    class="ForFilteringSchemes" id="checkHWasterQty" lay-skin="primary"
+                                                    lay-filter="checkHWasterQty" title="">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;" id="BT_HEmpNumber">鎿嶄綔鍛樹唬鐮�</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HEmpNumber">鎿嶄綔鍛樹唬鐮�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HEmpNumber" id="HEmpNumber">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HEmpNumber" id="HEmpNumber">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 85px;" id="BT_HEmpName">鎿嶄綔鍛樺悕绉�</label>
+                                            <label class="layui-form-label" style="width: 85px;"
+                                                id="BT_HEmpName">鎿嶄綔鍛樺悕绉�</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HEmpName" id="HEmpName">
                                             </div>
                                         </div>
-                                    </div>                                    
+                                    </div>
                                     <div id="filter-row">
                                         <!--杩囨护妗唄tml-->
                                     </div>
@@ -544,6 +571,7 @@
                         , title: '缂栬緫' + HPageTitle  //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
                         , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
                         , shade: 0.6 //閬僵閫忔槑搴�
+                        , scrollbar: false
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲                       
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                         , content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes'] //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
@@ -931,7 +959,7 @@
                         break;
                     //璇诲彇鏂规
                     case 'set_ReadScheme': set_ReadScheme();
-                        break;                   
+                        break;
                 };
             });
 
@@ -1022,6 +1050,7 @@
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+                    , scrollbar: false
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1128,7 +1157,7 @@
                     }, error: function () {
                         layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 });
                     }
-                })                
+                })
             }
             //#endregion
 
@@ -1149,6 +1178,7 @@
                     , area: ["50%", "90%"] //绐椾綋澶у皬
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName1 + '&colName=' + colName, "yes"]
+                    , scrollbar: false
                     , btn: ["纭畾", "鍙栨秷"]
                     , btn1: function (index, laero) {
                         //鍒锋柊琛ㄦ牸鏁版嵁
@@ -1262,6 +1292,7 @@
                     , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , scrollbar: false
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName2 + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
@@ -1377,6 +1408,7 @@
                     , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , scrollbar: false
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName3 + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
@@ -1492,6 +1524,7 @@
                     , closeBtn: 1  //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
                     , shift: 2 //寮瑰嚭鍔ㄧ敾
                     , area: ["50%", "90%"] //绐椾綋澶у皬
+                    , scrollbar: false
                     , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
                     , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName4 + '&colName=' + colName, "yes"]
                     , btn: ["纭畾", "鍙栨秷"]
@@ -1608,6 +1641,7 @@
                         , area: ['40%', '80%']
                         , title: '鎵撳嵃妯＄増閫夋嫨'
                         , shade: 0.6 //閬僵閫忔槑搴�
+                        , scrollbar: false
                         , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                         , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + "|" + 1 + '&MyMsg=' + linterid.toString() + '&Type=Cj_StationOutBill', 'yes']
@@ -1736,6 +1770,7 @@
                         , title: '宸ュ簭妫�楠屽崟-缂栬緫'
                         , shade: 0.6
                         , maxmin: false
+                        , scrollbar: false
                         , anim: 0
                         , content: ['../../璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3791&HICMOEntryID=0', 'yes']
                         , resize: false
@@ -1764,6 +1799,7 @@
                         , title: '宸ュ簭妫�楠屽崟-缂栬緫'
                         , shade: 0.6
                         , maxmin: false
+                        , scrollbar: false
                         , anim: 0
                         , content: ['../../鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html?OperationType=2&linterid=' + linterid + '&HEntryID=&HSouceBillType=3791', 'yes']
                         , resize: false
@@ -1811,6 +1847,7 @@
                         , maxmin: false
                         , anim: 0
                         , content: ['../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html?OperationType=' + 6 + '&linterid=' + linterid.toString() + '&HEntry=0&HProcNo=' + 0 + '&HEntryID=' + 0 + '', 'yes']
+                        , scrollbar: false
                         , resize: false
                         , cancel: function () {
                             btnIs();
@@ -1838,6 +1875,7 @@
                         , maxmin: false
                         , anim: 0
                         , content: ['../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill_Sup.html?OperationType=1&linterid=' + linterid.toString() + '&HEntry=', 'yes']
+                        , scrollbar: false
                         , resize: false
                         , cancel: function () {
                             btnIs();
@@ -1858,6 +1896,7 @@
                     , maxmin: false
                     , anim: 0
                     , content: ['Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=0&closeType=1', 'yes']
+                    , scrollbar: false
                     , resize: false
                     , cancel: function () {
                         btnIs();
@@ -1890,6 +1929,7 @@
                     , maxmin: false
                     , anim: 0
                     , content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+                    , scrollbar: false
                     , resize: false
                     , cancel: function () {
                         btnIs();
@@ -2021,7 +2061,7 @@
                 sWhere += buildFilterWhere(ColName1, Comparator1, ColContent1, Logical_judgement, sWhere);
                 sWhere += buildFilterWhere(ColName2, Comparator2, ColContent2, Logical_judgement1, sWhere);
                 //鎷彿鍖归厤
-                sWhere=fixParenthesesMatching(sWhere);
+                sWhere = fixParenthesesMatching(sWhere);
                 if (HBeginDate) {
                     sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= ''" + HBeginDate + "''";
                 }
@@ -2180,7 +2220,7 @@
                 });
                 layer.close(wait);
             }
-           
+
             //#region 鏌ヨ-鍒嗛〉
             function get_DisplayPage(sWhere) {
                 var wait = layer.load();//閬僵
@@ -2280,11 +2320,11 @@
                             ins = table.render(option);
                             //鍒锋柊鎸夐挳鏄剧ず
                             Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
-                            
+
 
                             tableFilterIns = table.render(optionPage);
                             tableFilter.render(tableFilterIns);
-               
+
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
@@ -2322,7 +2362,7 @@
                         $.ajax({
                             url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
                             type: "GET",
-                            data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791"  },
+                            data: { "HInterID": data[0].hmainid, "HDeleteMan": sessionStorage["HUserName"], "HBillSubType": "3791" },
                             success: function (result) {
                                 if (result.count == 1) {
                                     get_FastQuery();
@@ -2360,8 +2400,8 @@
 
                 $("#HInitTimeCycle").val("29");
             }
-             //#endregion
-          
+            //#endregion
+
             //閫�鍑�
             function get_Exit() {
                 Pub_Close(2);
@@ -2635,7 +2675,7 @@
                     type: "GET",
                     async: false,
                     url: GetWEBURL() + "/Xt_User/UserDeptlistPlaylist", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    data: { "HUserID": sessionStorage["Czybm"]},
+                    data: { "HUserID": sessionStorage["Czybm"] },
                     success: function (result) {
                         if (result.count == 1) {
                             if (result.data.length > 0) {
@@ -2645,7 +2685,7 @@
                                 res = res.slice(0, -1);
                                 res = ` and HDeptID in (${res})`
                             }
-                            
+
                         }
                     }, error: function (err) {
                         res = " and 1 = 0";
@@ -2950,4 +2990,5 @@
     </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\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index c296932..43dca09 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8" />
     <title>褰撳墠宸ュ崟(鎵爜姹囨姤)</title>
@@ -17,6 +18,7 @@
     <script src="../../../layuiadmin/echarts.min.js"></script>
     <script src="../../../layuiadmin/PlateBinding.js"></script>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
@@ -25,46 +27,66 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div style="width: 65%; height: calc(135vh); float: left; background-color: rgb(255 255 255) ">
                             <div id="top" style="width:100%;height:calc(60vh);">
-                                <div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
+                                <div id="top-left" style="width: 20%; height: calc(40vh); float: left;">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">璁惧</span></label>
+                                        <label class="layui-form-label" style="width: 30px;"><span
+                                                style="font-weight:bolder">璁惧</span></label>
                                     </div>
                                     <div>
-                                        <img src="../../../layuiadmin/layui/images/device.png" onerror="javascript:this.src='../../../layuiadmin/layui/images/erro.png';this.onerror = null" style="width:40%;height:calc(15vh);float:left" />
+                                        <!-- <img src="../../../layuiadmin/layui/images/device.png"
+                                            onerror="javascript:this.src='../../../layuiadmin/layui/images/erro.png';this.onerror = null"
+                                            style="width:40%;height:calc(15vh);float:left" /> -->
                                         <div style="float:left;margin-left:5%;">
                                             <dl>
                                                 <dd>
                                                     <h2><span style="margin-left:10px;" id="HEquipName"></span></h2>
-                                                    <h3><span>璁惧缂栧彿:<span style="margin-left:10px;" id="HEquipCode"></span></span></h3>
-                                                    <h3><span>璁惧鐘舵��:<span style="margin-left:10px;" id="HEquipStatus"></span></span></h3>
-                                                    <h3><span>杩愯鏃堕棿:<span style="margin-left:10px;" id="HWorkTime"></span></span></h3>
-                                                    <h3><span>褰撴棩鐐规鏃堕棿:<span style="margin-left:10px;" id="HDotCheckDate"></span></span></h3>
-                                                    <h3><span>鏈�鍚庝繚鍏绘椂闂�:<span style="margin-left:10px;" id="HMaintainDate"></span></span></h3>
+                                                    <h3><span>璁惧缂栧彿:<span style="margin-left:10px;"
+                                                                id="HEquipCode"></span></span></h3>
+                                                    <h3><span>璁惧鐘舵��:<span style="margin-left:10px;"
+                                                                id="HEquipStatus"></span></span></h3>
+                                                    <h3><span>杩愯鏃堕棿:<span style="margin-left:10px;"
+                                                                id="HWorkTime"></span></span></h3>
+                                                    <h3><span>褰撴棩鐐规鏃堕棿:<span style="margin-left:10px;"
+                                                                id="HDotCheckDate"></span></span></h3>
+                                                    <h3><span>鏈�鍚庝繚鍏绘椂闂�:<span style="margin-left:10px;"
+                                                                id="HMaintainDate"></span></span></h3>
                                                 </dd>
                                             </dl>
                                         </div>
                                     </div>
                                 </div>
-                                <div id="center-center" style="width: 15%; height: calc(40vh); float: left; margin-left: 0.2%;">
-                                    <div id="chart1" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
-                                </div>
-                                <div id="center-right" style="width: 500px; height: calc(40vh); float: left;margin-top:5%;">
+                                <!-- <div id="center-center"
+                                    style="width: 15%; height: calc(40vh); float: left; margin-left: 0.2%;">
+                                    <div id="chart1" style="width: 75%; height: calc(40vh); left: 2%; float: left;">
+                                    </div>
+                                </div> -->
+                                <div id="center-right"
+                                    style="width: 75%; height: calc(40vh); float: left;margin-top:5%;">
                                     <div class="layui-row" style="margin-bottom: 30px;">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">鏉″舰鐮�:</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBarCodeSN" value="" lay-verify="HBarCodeSN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅" id="HBarCodeSN" style="width: 240px;">
+                                                <input type="text" class="layui-input" name="HBarCodeSN" value=""
+                                                    lay-verify="HBarCodeSN" autocomplete="off" placeholder="璇烽敭鍏ュ悗鍥炶溅"
+                                                    id="HBarCodeSN" style="width: 240px;">
                                                 <input type="hidden" name="HBarCode" id="HBarCode" value="">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">宸ュ簭:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HProcName" value="" lay-verify="HProcName" id="HProcName" style="background-color: #efefef4d; width: 43%; 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="btnHProcID" id="btnHProcID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HProcName" value=""
+                                                    lay-verify="HProcName" id="HProcName"
+                                                    style="background-color: #efefef4d; width: 80%; 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="btnHProcID" id="btnHProcID"
+                                                    style="padding: 0 10px;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
@@ -72,174 +94,286 @@
                                         <div class="layui-inline" style="display:none">
                                             <label class="layui-form-label" style="width: 65px;">娴佹按鍙�:</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HProcNo" value="" lay-verify="HProcNo" id="HProcNo" style="width: 150px; background-color: #efefef4d; " readonly>
+                                                <input type="text" class="layui-input" name="HProcNo" value=""
+                                                    lay-verify="HProcNo" id="HProcNo"
+                                                    style="width: 150px; background-color: #efefef4d; " readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鐢熶骇璧勬簮:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HSourceName" value="" lay-verify="HSourceName" id="HSourceName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HSourceID" id="HSourceID" lay-verify="HSourceID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HSourceName" value=""
+                                                    lay-verify="HSourceName" id="HSourceName"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HSourceID" id="HSourceID"
+                                                    lay-verify="HSourceID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHSourceID" id="btnHSourceID"
+                                                    style="padding: 0 10px;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鍚堟牸鏁伴噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HQty" value="0" lay-verify="HQty" id="HQty" style="width: 150px;">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">閲嶉噺:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWeight" value="0" lay-verify="HWeight" id="HWeight" style="width: 150px;">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">宸ヤ綔涓績:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HCenterName" value="" lay-verify="HCenterName" id="HCenterName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HCenterID" id="HCenterID" lay-verify="HCenterID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHCenterID" id="btnHCenterID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HCenterName" value=""
+                                                    lay-verify="HCenterName" id="HCenterName"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID"
+                                                    lay-verify="HCenterID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHCenterID" id="btnHCenterID"
+                                                    style="padding: 0 10px;margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鐢熶骇鐝粍:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HGroupName" value="" lay-verify="HGroupName" id="HGroupName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HGroupName" value=""
+                                                    lay-verify="HGroupName" id="HGroupName"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" lay-verify="HGroupID"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHGroupID" id="btnHGroupID"
+                                                    style="padding: 0 10px; margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鎿嶄綔宸�:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HEmpName" value="" lay-verify="HEmpName" id="HEmpName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 6em;">鍚堟牸鏁伴噺:<label
+                                                    style="color:red"> * </label></label>
+                                            <div class="layui-input-inline" style="width: calc(100% - 12em);">
+                                                <input type="text" class="layui-input layui-input-number" name="HQty"
+                                                    value="0" lay-verify="HQty" id="HQty" style="width: 100%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">閲嶉噺:<label
+                                                    style="color:red"> * </label></label>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input layui-input-number" name="HWeight"
+                                                    value="0" lay-verify="HWeight" id="HWeight" style="width: 100%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-bottom: 15px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">姣忕鏁伴噺:</label>
+                                            <div class="layui-input-block" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input layui-input-number" name="HPerQty"
+                                                    value="" lay-verify="HPerQty" id="HPerQty" style="width: 100%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-bottom: 15px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">绠辨暟:<label
+                                                    style="color:red"> * </label></label>
+                                            <div class="layui-input-block" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input layui-input-number"
+                                                    name="HPieceQty" value="1" lay-verify="HPieceQty" id="HPieceQty" 
+                                                    style="width: 100%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 6em;">鐢熶骇鐝:<label
+                                                    style="color:red"> * </label></label>
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 12em)">
+                                                <input type="text" class="layui-input" name="HShiftsName" value=""
+                                                    lay-verify="HShiftsName" id="HShiftsName"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HShiftsID" id="HShiftsID"
+                                                    lay-verify="HShiftsID" value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="HWorkShiftList" id="HWorkShiftList"
+                                                    style="padding: 0 10px; margin-right: 3px;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                 </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                    </div>
+                                    <div class="layui-row" style="margin-bottom: 15px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">鎿嶄綔宸�:<label
+                                                    style="color:red"> * </label></label>
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HEmpName" value=""
+                                                    lay-verify="HEmpName" id="HEmpName"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" lay-verify="HEmpID"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHEmpID" id="btnHEmpID"
+                                                    style="padding: 0 10px; margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline" style="display:none">
                                             <label class="layui-form-label" style="width: 65px;">宸ユ椂</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HWorkTimes" id="HWorkTimes"
+                                                    value="0" style="width: 150px;">
                                             </div>
                                         </div>
-                                    </div>
-                                    <div class="layui-row" style="margin-bottom: 15px;display:none">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鎿嶄綔宸�2:<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HEmp2Name" value="" lay-verify="HEmp2Name" id="HEmp2Name" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp2ID" id="btnHEmp2ID" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">鎶�鏈憳:</label>
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HEmp4Name" value=""
+                                                    lay-verify="HEmp4Name" id="HEmp4Name"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HEmpID4" id="HEmpID4" lay-verify="HEmpID4"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHEmp4ID" id="btnHEmp4ID"
+                                                    style="padding: 0 10px;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: 65px;">鎿嶄綔宸�3:<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HEmp3Name" value="" lay-verify="HEmp3Name" id="HEmp3Name" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID3" id="HEmpID3" lay-verify="HEmpID3" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp3ID" id="btnHEmp3ID" 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" style="margin-bottom: 15px;display:none">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鎿嶄綔宸�4:<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HEmp4Name" value="" lay-verify="HEmp4Name" id="HEmp4Name" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HEmpID4" id="HEmpID4" lay-verify="HEmpID4" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEmp4ID" id="btnHEmp4ID" 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: 65px;">绠辨暟:<label style="color:red"> * </label></label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HPieceQty" value="" lay-verify="HPieceQty" id="HPieceQty" style="width: 150px;">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鍗曟嵁鏃ユ湡:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="date" class="layui-input" name="HDate" lay-verify="HDate" style="width: 150px;" autocomplete="off" id="HDate">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">鏈轰慨宸�:</label>
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HEmp2Name" value=""
+                                                    lay-verify="HEmp2Name" id="HEmp2Name"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HEmpID2" id="HEmpID2" lay-verify="HEmpID2"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHEmp2ID" id="btnHEmp2ID"
+                                                    style="padding: 0 10px;margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">妯″叿宸�:</label>
+                                            <div class="layui-input-inline"
+                                                style="margin-left: 9px; width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HEmp3Name" value=""
+                                                    lay-verify="HEmp3Name" id="HEmp3Name"
+                                                    style="background-color: #efefef4d; width: 80%; display: inline-block;"
+                                                    readonly>
+                                                <input type="hidden" name="HEmpID3" id="HEmpID3" lay-verify="HEmpID3"
+                                                    value="0">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button"
+                                                    lay-submit="" lay-filter="btnHEmp3ID" id="btnHEmp3ID"
+                                                    style="padding: 0 10px; margin-right: 3px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row" style="margin-bottom: 15px;">
+                                        <div class="layui-inline layui-col-xs6">
+                                            <label class="layui-form-label" style="width: 65px;">鍗曟嵁鏃ユ湡:</label>
+                                            <div class="layui-input-block"
+                                                style="margin-left: 95px; width: calc(100% - 150px);">
+                                                <input type="date" class="layui-input" name="HDate" lay-verify="HDate"
+                                                    style="width: 100%;" autocomplete="off" id="HDate">
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鍗曟嵁鍙�:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBillNo" value="" lay-verify="HBillNo" style="width: 150px; background-color: #efefef4d; font-size: 12.5px;" autocomplete="off" id="HBillNo" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HBillNo" value=""
+                                                    lay-verify="HBillNo"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 12.5px;"
+                                                    autocomplete="off" id="HBillNo" readonly>
                                                 <input type="hidden" name="HInterID" id="HInterID">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鐢熶骇璁㈠崟:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HICMOBillNo" value="" lay-verify="HICMOBillNo" style="width: 150px; background-color: #efefef4d; font-size: 13px;" autocomplete="off" id="HICMOBillNo" readonly>
+                                            <div class="layui-input-block" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" value=""
+                                                    lay-verify="HICMOBillNo"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 13px;"
+                                                    autocomplete="off" id="HICMOBillNo" readonly>
                                                 <input type="hidden" name="HICMOInterID" id="HICMOInterID">
                                                 <input type="hidden" name="HICMOEntryID" id="HICMOEntryID">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">娴佽浆鍗�:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HProcExchBillNo" value="" lay-verify="HProcExchBillNo" style="width: 150px; background-color: #efefef4d; font-size: 13px;" autocomplete="off" id="HProcExchBillNo" readonly>
-                                                <input type="hidden" class="layui-input" name="lngBillKey" id="lngBillKey">
-                                                <input type="hidden" class="layui-input" name="lngBillSubKey" id="lngBillSubKey">
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" value=""
+                                                    lay-verify="HProcExchBillNo"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 13px;"
+                                                    autocomplete="off" id="HProcExchBillNo" readonly>
+                                                <input type="hidden" class="layui-input" name="lngBillKey"
+                                                    id="lngBillKey">
+                                                <input type="hidden" class="layui-input" name="lngBillSubKey"
+                                                    id="lngBillSubKey">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鐗╂枡浠ｇ爜:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterNumber" value="" lay-verify="HMaterNumber" style="width: 150px; background-color: #efefef4d; font-size: 13px;" autocomplete="off" id="HMaterNumber" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HMaterNumber" value=""
+                                                    lay-verify="HMaterNumber"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 13px;"
+                                                    autocomplete="off" id="HMaterNumber" readonly>
                                                 <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">鐗╂枡鍚嶇О:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterName" value="" lay-verify="HMaterName" style="width: 150px; background-color: #efefef4d; font-size: 13px;" autocomplete="off" id="HMaterName" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HMaterName" value=""
+                                                    lay-verify="HMaterName"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 13px;"
+                                                    autocomplete="off" id="HMaterName" readonly>
 
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">瑙勬牸鍨嬪彿:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMaterModel" value="" lay-verify="HMaterModel" style="width: 150px; background-color: #efefef4d; font-size: 13px;" autocomplete="off" id="HMaterModel" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HMaterModel" value=""
+                                                    lay-verify="HMaterModel"
+                                                    style="width: 100%; background-color: #efefef4d; font-size: 13px;"
+                                                    autocomplete="off" id="HMaterModel" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">璁￠噺鍗曚綅:</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HUnitName" value="" lay-verify="HUnitName" style="width: 150px; background-color: #efefef4d;" autocomplete="off" id="HUnitName" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HUnitName" value=""
+                                                    lay-verify="HUnitName"
+                                                    style="width: 100%; background-color: #efefef4d;" autocomplete="off"
+                                                    id="HUnitName" readonly>
                                                 <input type="hidden" name="HUnitID" id="HUnitID">
                                                 <input type="hidden" name="eventType" id="eventType" value="Add">
                                                 <input type="hidden" name="HPRDOrgID" id="HPRDOrgID" value="0">
@@ -253,7 +387,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">绌村彿</label>
                                             <div class="layui-input-block" style="margin-left: 95px; width: 150px">
-                                                <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search class="layui-input">
+                                                <select name="HMouldNum" id="HMouldNum" lay-verify="required" lay-search
+                                                    class="layui-input">
                                                     <option value="0#" selected>0#</option>
                                                     <option value="1#">1#</option>
                                                     <option value="2#">2#</option>
@@ -271,7 +406,8 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">涓嶈壇鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBadCount" id="HBadCount" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HBadCount" id="HBadCount"
+                                                    value="0" style="width: 150px;">
                                             </div>
                                         </div>
                                     </div>
@@ -279,13 +415,15 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">閬楀け鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HLossQty" id="HLossQty" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HLossQty" id="HLossQty"
+                                                    value="0" style="width: 150px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">鍙栨牱鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HToCheckQty" id="HToCheckQty" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HToCheckQty"
+                                                    id="HToCheckQty" value="0" style="width: 150px;">
                                             </div>
                                         </div>
                                     </div>
@@ -293,13 +431,16 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">鎶ュ簾鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty"
+                                                    value="0" style="width: 150px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">杩斿伐鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HBackWorkQty" id="HBackWorkQty" value="0" style="width: 150px;" autocomplete="off">
+                                                <input type="text" class="layui-input" name="HBackWorkQty"
+                                                    id="HBackWorkQty" value="0" style="width: 150px;"
+                                                    autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
@@ -307,96 +448,109 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">宸ュ簾鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWasterQty_Work" id="HWasterQty_Work" value="0" style="width: 150px;" autocomplete="off">
+                                                <input type="text" class="layui-input" name="HWasterQty_Work"
+                                                    id="HWasterQty_Work" value="0" style="width: 150px;"
+                                                    autocomplete="off">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">鏂欏簾鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HWasterQty_Mater" id="HWasterQty_Mater" value="0" style="width: 150px;" autocomplete="off">
+                                                <input type="text" class="layui-input" name="HWasterQty_Mater"
+                                                    id="HWasterQty_Mater" value="0" style="width: 150px;"
+                                                    autocomplete="off">
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px; ">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">妯″叿缂栧彿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" value="" style="width: 150px;" readonly>
-                                                <input type="hidden" class="layui-input" name="HMouldID" id="HMouldID" value="0">
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HMouldNo" id="HMouldNo"
+                                                    value="" style="width: 100%;" readonly>
+                                                <input type="hidden" class="layui-input" name="HMouldID" id="HMouldID"
+                                                    value="0">
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">妯″叿鍚嶇О</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" style="width: 150px;" readonly>
+                                            <div class="layui-input-block" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HMouldName" id="HMouldName"
+                                                    value="" style="width: 100%;" readonly>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="layui-row" style="margin-bottom: 15px;">
-                                        <div class="layui-inline">
+                                        <div class="layui-inline layui-col-xs6">
                                             <label class="layui-form-label" style="width: 65px;">妯″叿鍨嬪彿</label>
-                                            <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HModel" id="HModel" value="" style="width: 150px;" readonly>
+                                            <div class="layui-input-inline" style="width: calc(100% - 150px);">
+                                                <input type="text" class="layui-input" name="HModel" id="HModel"
+                                                    value="" style="width: 100%;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
+                                        <div class="layui-inline" style="display: none">
                                             <label class="layui-form-label" style="width: 65px;">璁惧宸ユ椂</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HMachineWorkTimes" id="HMachineWorkTimes" value="0" style="width: 150px;">
+                                                <input type="text" class="layui-input" name="HMachineWorkTimes"
+                                                    id="HMachineWorkTimes" value="0" style="width: 150px;">
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row" style="margin-bottom: 15px;">
+                                    <div class="layui-row" style="margin-bottom: 15px; display: none ">
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 65px;">鎶曞叆鏁伴噺</label>
                                             <div class="layui-input-block" style="margin-left: 95px;">
-                                                <input type="text" class="layui-input" name="HTRQty" id="HTRQty" value="" style="width: 150px;" readonly>
+                                                <input type="text" class="layui-input" name="HTRQty" id="HTRQty"
+                                                    value="" style="width: 150px;" readonly>
                                             </div>
                                         </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 65px;">鐢熶骇鐝:</label>
-                                            <div class="layui-input-block" style="margin-left: 9px;">
-                                                <input type="text" class="layui-input" name="HShiftsName" value="" lay-verify="HShiftsName" id="HShiftsName" style="background-color: #efefef4d; width: 43%; display: inline-block;" readonly>
-                                                <input type="hidden" name="HShiftsID" id="HShiftsID" lay-verify="HShiftsID" value="0">
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShiftList" id="HWorkShiftList" 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" style="margin-bottom: 15px; text-align: center;">
                                         <div style="margin-top: 20px;">
-                                            <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Add">鏂板</button>
-                                            <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius" style="margin-right: 20px;" id="Saver">淇濆瓨</button>
-                                            <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius" id="Exit">閫�鍑�</button>
+                                            <button type="button" lay-submit="" lay-filter="Add"
+                                                class="layui-btn layui-btn-radius" style="margin-right: 20px;"
+                                                id="Add">鏂板</button>
+                                            <button type="button" lay-submit="" lay-filter="Saver"
+                                                class="layui-btn layui-btn-radius" style="margin-right: 20px;"
+                                                id="Saver">淇濆瓨</button>
+                                            <button type="button" lay-submit="" lay-filter="Exit"
+                                                class="layui-btn layui-btn-radius" id="Exit">閫�鍑�</button>
                                         </div>
                                     </div>
                                 </div>
-                               
+
                             </div>
-                            <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
+                            <!-- <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
                                 <div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">浜哄憳</span></label>
+                                        <label class="layui-form-label" style="width: 30px;"><span
+                                                style="font-weight:bolder">浜哄憳</span></label>
                                     </div>
                                     <div style="margin-left:25%;">
                                         <dl>
                                             <dd>
-                                                <h2><span>閮ㄩ棬:<span style="margin-left:10px;" id="HDepName"></span></span></h2>
-                                                <h3><span>鐝粍:<span style="margin-left:10px;" id="HGroupName"></span></span></h3>
-                                                <h3><span>鎿嶄綔鍛�:<span style="margin-left:10px;" id="HEmpName"></span></span></h3>
-                                                <h3><span>璐熻矗浜�:<span style="margin-left:10px;" id="HManagerName"></span></span></h3>
+                                                <h2><span>閮ㄩ棬:<span style="margin-left:10px;"
+                                                            id="HDepName"></span></span></h2>
+                                                <h3><span>鐝粍:<span style="margin-left:10px;"
+                                                            id="HGroupName"></span></span></h3>
+                                                <h3><span>鎿嶄綔鍛�:<span style="margin-left:10px;"
+                                                            id="HEmpName"></span></span></h3>
+                                                <h3><span>璐熻矗浜�:<span style="margin-left:10px;"
+                                                            id="HManagerName"></span></span></h3>
                                             </dd>
                                         </dl>
                                     </div>
                                 </div>
-                                <div id="center-right" style="width: 15%; height: calc(40vh); float: left; margin-left: 0.2%; ">
-                                    <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
+                                <div id="center-right"
+                                    style="width: 15%; height: calc(40vh); float: left; margin-left: 0.2%; ">
+                                    <div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;">
+                                    </div>
                                 </div>
-                            </div>
+                            </div> -->
                             <!--<div id="bottom" style="width: 100%; height: calc(20vh);">
                                 <div id="bottom-left" style="width: 100%; height: calc(10vh);">
-                                    <div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px ">                                       
+                                    <div style="text-align: left; width: 100%; height: calc(20vh); margin-left:410px ">
                                         <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius " style="margin-left: 20%;" id="Add">鏂板</button>
                                         <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius " style="margin-left: 5%; " id="Saver">淇濆瓨</button>
                                         <button type="button" lay-submit="" lay-filter="Exit" class="layui-btn layui-btn-radius " style="margin-left: 5%; " id="Exit">閫�鍑�</button>
@@ -404,7 +558,8 @@
                                 </div>
                             </div>-->
                         </div>
-                        <div id="center-right-maintable" style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
+                        <div id="center-right-maintable"
+                            style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
                             <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>
@@ -412,7 +567,8 @@
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
                                         <div class="layui-form-item">
-                                            <table class="" id="mainTable" style="width:110%;" lay-filter="mainTable"></table>
+                                            <table class="" id="mainTable" style="width:110%;" lay-filter="mainTable">
+                                            </table>
                                         </div>
                                     </div>
                                 </div>
@@ -422,7 +578,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_EditBill" id="set_EditBill"><i class="layui-icon layui-icon-delete"></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="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
                             </div>
                         </script>
                     </form>
@@ -431,6 +587,7 @@
         </div>
     </div>
 </body>
+
 </html>
 <script>
     //鑾峰彇鍙傛暟
@@ -459,7 +616,7 @@
         HICMOInterID = data[0].HICMOInterID;//鐢熶骇璁㈠崟涓诲唴鐮�
         HICMOEntryID = data[0].HICMOEntryID;//鐢熶骇璁㈠崟瀛愬唴鐮�
         HSourceID = data[0].HSourceID;//鐢熶骇璧勬簮id
-        HSourceName = data[0].HSourceName;//鐢熶骇璧勬簮 
+        HSourceName = data[0].HSourceName;//鐢熶骇璧勬簮
         HEmpName = data[0].HEmpName;//鎿嶄綔鍛�
         HManagerName = data[0].HManagerName;//璐熻矗浜�
         HGroupName = data[0].HGroupName;//鐝粍
@@ -468,7 +625,8 @@
         base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
     }).extend({
         index: 'lib/index', //涓诲叆鍙ｆā鍧�
-    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+        numinput: 'numinput'
+    }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'numinput'], function () {
         //#region 鍏叡鍙橀噺
         var $ = layui.$
             , admin = layui.admin
@@ -480,6 +638,7 @@
             , laydate = layui.laydate
             , util = layui.util
             , soulTable = layui.soulTable
+            , numinp = layui.numinput
         var sWhere = "";
         var options = [];
         var HDeptID = "";
@@ -514,7 +673,7 @@
 
         }
 
-        if (OperationType==2) {
+        if (OperationType == 2) {
             txtHBarCode_KeyDown(HSourceBillNo);
         }
 
@@ -528,239 +687,239 @@
         //#endregion
 
         //#region 銆愪华琛ㄧ洏銆�
-        var chart1 = echarts.init(document.getElementById("chart1"));
-
-        var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];
-
-        var data1 = [{
-            name: "瀹屾垚鐜�",
-            value: HFinishRate.toFixed(2),
-        }];
-
-        // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
-        var option = {
-            //backgroundColor: "#000",
-            tooltip: {				// 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
-                show: true,
-                formatter: "{b}锛歿c}%",
-                backgroundColor: "rgba(50,50,50,0.7)",	// 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
-                borderColor: "#333",		// 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
-                borderWidth: 0,				// 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
-                padding: 5,					// 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
-                textStyle: {				// 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
-                    // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
-                },
-            },
-            series: [
-                {
-                    name: "鍗曚华琛ㄧ洏绀轰緥",		// 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
-                    type: "gauge",			// 绯诲垪绫诲瀷
-                    progress: {
-                        show: true
-                    },
-                    radius: "100%",			// 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
-                    center: ["50%", "50%"],	// 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
-                    startAngle: 225,		// 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
-                    endAngle: -45,			// 浠〃鐩樼粨鏉熻搴�,榛樿 -45
-                    clockwise: true,		// 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
-                    min: 0,					// 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
-                    max: 100,				// 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
-                    splitNumber: 10,		// 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
-                    axisLine: {				// 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
-                        show: true,				// 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
-                        lineStyle: {			// 浠〃鐩樿酱绾挎牱寮忋��
-                            color: colorTemplate1, 	//浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑  缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜�  棰滆壊  鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 5,					//杞寸嚎瀹藉害,榛樿 30銆�
-                            shadowBlur: 20,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        }
-                    },
-                    splitLine: {			// 鍒嗛殧绾挎牱寮忋��
-                        show: true,				// 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
-                        length: 0,				// 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
-                        lineStyle: {			// 鍒嗛殧绾挎牱寮忋��
-                            color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 2,					//绾垮害,榛樿 2銆�
-                            type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
-                            shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        }
-                    },
-                    axisTick: {				// 鍒诲害(绾�)鏍峰紡銆�
-                        show: false,				// 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
-                        splitNumber: 5,			// 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
-                        length: 8,				// 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
-                        lineStyle: {			// 鍒诲害绾挎牱寮忋��
-                            color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 1,					//绾垮害,榛樿 1銆�
-                            type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
-                            shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        },
-                    },
-                    axisLabel: {			// 鍒诲害鏍囩銆�
-                        show: false,				// 鏄惁鏄剧ず鏍囩,榛樿 true銆�
-                        distance: 5,			// 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
-                        color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
-                        fontSize: 9,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
-                        formatter: "{value}",	// 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
-                    },
-                    pointer: {				// 浠〃鐩樻寚閽堛��
-                        show: true,				// 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
-                        length: "70%",			// 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
-                        width: 5,				// 鎸囬拡瀹藉害,榛樿 8銆�
-                    },
-                    itemStyle: {			// 浠〃鐩樻寚閽堟牱寮忋��
-                        color: "auto",			// 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
-                        opacity: 1,				// 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                        borderWidth: 0,			// 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
-                        borderType: "solid",	// 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
-                        borderColor: "#000",	// 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
-                        shadowBlur: 10,			// (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                        shadowColor: "#fff",	// 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                    },
-                    emphasis: {				// 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
-                        itemStyle: {
-                            //楂樹寒 鍜屾甯�  涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
-                        }
-                    },
-                    title: {				// 浠〃鐩樻爣棰樸��
-                        show: true,				// 鏄惁鏄剧ず鏍囬,榛樿 true銆�
-                        offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
-                        color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
-                        fontSize: 20,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
-                    },
-                    detail: {				// 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
-                        show: true,				// 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
-                        offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
-                        color: "auto",			// 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
-                        fontSize: 30,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
-                        formatter: "{value}%",	// 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
-                    },
-                    data: data1
-                }
-            ]
-        };
-        // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
-        chart1.setOption(option);
-
-
-        var chart2 = echarts.init(document.getElementById("chart2"));
-
-        var data2 = [{
-            name: "鍚堟牸鐜�",
-            value: HQualifiedRate.toFixed(2),
-        }];
-
-        // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
-        var option2 = {
-            //backgroundColor: "#000",
-            tooltip: {				// 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
-                show: true,
-                formatter: "{b}锛歿c}%",
-                backgroundColor: "rgba(50,50,50,0.7)",	// 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
-                borderColor: "#333",		// 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
-                borderWidth: 0,				// 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
-                padding: 5,					// 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
-                textStyle: {				// 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
-                    // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
-                },
-            },
-            series: [
-                {
-                    name: "鍗曚华琛ㄧ洏绀轰緥",		// 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
-                    type: "gauge",			// 绯诲垪绫诲瀷
-                    radius: "100%",			// 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
-                    center: ["50%", "50%"],	// 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
-                    startAngle: 225,		// 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
-                    endAngle: -45,			// 浠〃鐩樼粨鏉熻搴�,榛樿 -45
-                    clockwise: true,		// 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
-                    min: 0,					// 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
-                    max: 100,				// 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
-                    splitNumber: 10,		// 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
-                    axisLine: {				// 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
-                        show: true,				// 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
-                        lineStyle: {			// 浠〃鐩樿酱绾挎牱寮忋��
-                            color: colorTemplate1, 	//浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑  缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜�  棰滆壊  鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 5,					//杞寸嚎瀹藉害,榛樿 30銆�
-                            shadowBlur: 20,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        }
-                    },
-                    splitLine: {			// 鍒嗛殧绾挎牱寮忋��
-                        show: true,				// 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
-                        length: 0,				// 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
-                        lineStyle: {			// 鍒嗛殧绾挎牱寮忋��
-                            color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 2,					//绾垮害,榛樿 2銆�
-                            type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
-                            shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        }
-                    },
-                    axisTick: {				// 鍒诲害(绾�)鏍峰紡銆�
-                        show: false,				// 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
-                        splitNumber: 5,			// 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
-                        length: 8,				// 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
-                        lineStyle: {			// 鍒诲害绾挎牱寮忋��
-                            color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
-                            opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                            width: 1,					//绾垮害,榛樿 1銆�
-                            type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
-                            shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                            shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                        },
-                    },
-                    axisLabel: {			// 鍒诲害鏍囩銆�
-                        show: false,				// 鏄惁鏄剧ず鏍囩,榛樿 true銆�
-                        distance: 5,			// 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
-                        color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
-                        fontSize: 9,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
-                        formatter: "{value}",	// 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
-                    },
-                    pointer: {				// 浠〃鐩樻寚閽堛��
-                        show: true,				// 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
-                        length: "70%",			// 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
-                        width: 5,				// 鎸囬拡瀹藉害,榛樿 8銆�
-                    },
-                    itemStyle: {			// 浠〃鐩樻寚閽堟牱寮忋��
-                        color: "auto",			// 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
-                        opacity: 1,				// 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
-                        borderWidth: 0,			// 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
-                        borderType: "solid",	// 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
-                        borderColor: "#000",	// 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
-                        shadowBlur: 10,			// (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
-                        shadowColor: "#fff",	// 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
-                    },
-                    emphasis: {				// 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
-                        itemStyle: {
-                            //楂樹寒 鍜屾甯�  涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
-                        }
-                    },
-                    title: {				// 浠〃鐩樻爣棰樸��
-                        show: true,				// 鏄惁鏄剧ず鏍囬,榛樿 true銆�
-                        offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
-                        color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
-                        fontSize: 20,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
-                    },
-                    detail: {				// 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
-                        show: true,				// 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
-                        offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
-                        color: "auto",			// 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
-                        fontSize: 30,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
-                        formatter: "{value}%",	// 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
-                    },
-                    data: data2
-                }
-            ]
-        };
-        // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
-        chart2.setOption(option2);
+        //var chart1 = echarts.init(document.getElementById("chart1"));
+        //
+        //var colorTemplate1 = [[0.2, "rgba(255,0,0,0.8)"], [0.8, "rgba(0,255,255,0.8)"], [1, "rgba(0,255,0,0.8)"]];
+        //
+        //var data1 = [{
+        //    name: "瀹屾垚鐜�",
+        //    value: HFinishRate.toFixed(2),
+        //}];
+        //
+        //// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+        //var option = {
+        //    //backgroundColor: "#000",
+        //    tooltip: {				// 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+        //        show: true,
+        //        formatter: "{b}锛歿c}%",
+        //        backgroundColor: "rgba(50,50,50,0.7)",	// 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+        //        borderColor: "#333",		// 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+        //        borderWidth: 0,				// 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+        //        padding: 5,					// 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+        //        textStyle: {				// 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+        //            // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+        //        },
+        //    },
+        //    series: [
+        //        {
+        //            name: "鍗曚华琛ㄧ洏绀轰緥",		// 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+        //            type: "gauge",			// 绯诲垪绫诲瀷
+        //            progress: {
+        //                show: true
+        //            },
+        //            radius: "100%",			// 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+        //            center: ["50%", "50%"],	// 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+        //            startAngle: 225,		// 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+        //            endAngle: -45,			// 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+        //            clockwise: true,		// 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+        //            min: 0,					// 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+        //            max: 100,				// 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+        //            splitNumber: 10,		// 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+        //            axisLine: {				// 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+        //                show: true,				// 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+        //                lineStyle: {			// 浠〃鐩樿酱绾挎牱寮忋��
+        //                    color: colorTemplate1, 	//浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑  缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜�  棰滆壊  鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 5,					//杞寸嚎瀹藉害,榛樿 30銆�
+        //                    shadowBlur: 20,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                }
+        //            },
+        //            splitLine: {			// 鍒嗛殧绾挎牱寮忋��
+        //                show: true,				// 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+        //                length: 0,				// 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+        //                lineStyle: {			// 鍒嗛殧绾挎牱寮忋��
+        //                    color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 2,					//绾垮害,榛樿 2銆�
+        //                    type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+        //                    shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                }
+        //            },
+        //            axisTick: {				// 鍒诲害(绾�)鏍峰紡銆�
+        //                show: false,				// 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+        //                splitNumber: 5,			// 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+        //                length: 8,				// 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+        //                lineStyle: {			// 鍒诲害绾挎牱寮忋��
+        //                    color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 1,					//绾垮害,榛樿 1銆�
+        //                    type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+        //                    shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                },
+        //            },
+        //            axisLabel: {			// 鍒诲害鏍囩銆�
+        //                show: false,				// 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+        //                distance: 5,			// 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+        //                color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+        //                fontSize: 9,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+        //                formatter: "{value}",	// 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+        //            },
+        //            pointer: {				// 浠〃鐩樻寚閽堛��
+        //                show: true,				// 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+        //                length: "70%",			// 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+        //                width: 5,				// 鎸囬拡瀹藉害,榛樿 8銆�
+        //            },
+        //            itemStyle: {			// 浠〃鐩樻寚閽堟牱寮忋��
+        //                color: "auto",			// 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+        //                opacity: 1,				// 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                borderWidth: 0,			// 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+        //                borderType: "solid",	// 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+        //                borderColor: "#000",	// 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+        //                shadowBlur: 10,			// (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                shadowColor: "#fff",	// 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //            },
+        //            emphasis: {				// 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+        //                itemStyle: {
+        //                    //楂樹寒 鍜屾甯�  涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+        //                }
+        //            },
+        //            title: {				// 浠〃鐩樻爣棰樸��
+        //                show: true,				// 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+        //                offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+        //                color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+        //                fontSize: 20,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+        //            },
+        //            detail: {				// 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+        //                show: true,				// 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+        //                offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+        //                color: "auto",			// 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+        //                fontSize: 30,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+        //                formatter: "{value}%",	// 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+        //            },
+        //            data: data1
+        //        }
+        //    ]
+        //};
+        //// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+        //chart1.setOption(option);
+        //
+        //
+        //var chart2 = echarts.init(document.getElementById("chart2"));
+        //
+        //var data2 = [{
+        //    name: "鍚堟牸鐜�",
+        //    value: HQualifiedRate.toFixed(2),
+        //}];
+        //
+        //// 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+        //var option2 = {
+        //    //backgroundColor: "#000",
+        //    tooltip: {				// 鏈郴鍒楃壒瀹氱殑 tooltip 璁惧畾銆�
+        //        show: true,
+        //        formatter: "{b}锛歿c}%",
+        //        backgroundColor: "rgba(50,50,50,0.7)",	// 鎻愮ず妗嗘诞灞傜殑鑳屾櫙棰滆壊銆傛敞鎰忥細series.tooltip 浠呭湪 tooltip.trigger 涓� 'item' 鏃舵湁鏁堛��
+        //        borderColor: "#333",		// 鎻愮ず妗嗘诞灞傜殑杈规棰滆壊銆�...
+        //        borderWidth: 0,				// 鎻愮ず妗嗘诞灞傜殑杈规瀹姐��...
+        //        padding: 5,					// 鎻愮ず妗嗘诞灞傚唴杈硅窛锛屽崟浣峱x锛岄粯璁ゅ悇鏂瑰悜鍐呰竟璺濅负5锛屾帴鍙楁暟缁勫垎鍒瀹氫笂鍙充笅宸﹁竟璺濄��...
+        //        textStyle: {				// 鎻愮ず妗嗘诞灞傜殑鏂囨湰鏍峰紡銆�...
+        //            // color ,fontStyle ,fontWeight ,fontFamily ,fontSize ,lineHeight ,.......
+        //        },
+        //    },
+        //    series: [
+        //        {
+        //            name: "鍗曚华琛ㄧ洏绀轰緥",		// 绯诲垪鍚嶇О,鐢ㄤ簬tooltip鐨勬樉绀猴紝legend 鐨勫浘渚嬬瓫閫夛紝鍦� setOption 鏇存柊鏁版嵁鍜岄厤缃」鏃剁敤浜庢寚瀹氬搴旂殑绯诲垪銆�
+        //            type: "gauge",			// 绯诲垪绫诲瀷
+        //            radius: "100%",			// 鍙傛暟:number, string銆� 浠〃鐩樺崐寰�,榛樿 75% 锛屽彲浠ユ槸鐩稿浜庡鍣ㄩ珮瀹戒腑杈冨皬鐨勪竴椤圭殑涓�鍗婄殑鐧惧垎姣旓紝涔熷彲浠ユ槸缁濆鐨勬暟鍊笺��
+        //            center: ["50%", "50%"],	// 浠〃鐩樹綅缃�(鍦嗗績鍧愭爣)
+        //            startAngle: 225,		// 浠〃鐩樿捣濮嬭搴�,榛樿 225銆傚渾蹇� 姝ｅ彸鎵嬩晶涓�0搴︼紝姝ｄ笂鏂逛负90搴︼紝姝ｅ乏鎵嬩晶涓�180搴︺��
+        //            endAngle: -45,			// 浠〃鐩樼粨鏉熻搴�,榛樿 -45
+        //            clockwise: true,		// 浠〃鐩樺埢搴︽槸鍚︽槸椤烘椂閽堝闀�,榛樿 true銆�
+        //            min: 0,					// 鏈�灏忕殑鏁版嵁鍊�,榛樿 0 銆傛槧灏勫埌 minAngle銆�
+        //            max: 100,				// 鏈�澶х殑鏁版嵁鍊�,榛樿 100 銆傛槧灏勫埌 maxAngle銆�
+        //            splitNumber: 10,		// 浠〃鐩樺埢搴︾殑鍒嗗壊娈垫暟,榛樿 10銆�
+        //            axisLine: {				// 浠〃鐩樿酱绾�(杞粨绾�)鐩稿叧閰嶇疆銆�
+        //                show: true,				// 鏄惁鏄剧ず浠〃鐩樿酱绾�(杞粨绾�),榛樿 true銆�
+        //                lineStyle: {			// 浠〃鐩樿酱绾挎牱寮忋��
+        //                    color: colorTemplate1, 	//浠〃鐩樼殑杞寸嚎鍙互琚垎鎴愪笉鍚岄鑹茬殑澶氭銆傛瘡娈电殑  缁撴潫浣嶇疆(鑼冨洿鏄痆0,1]) 鍜�  棰滆壊  鍙互閫氳繃涓�涓暟缁勬潵琛ㄧず銆傞粯璁ゅ彇鍊硷細[[0.2, '#91c7ae'], [0.8, '#63869e'], [1, '#c23531']]
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 5,					//杞寸嚎瀹藉害,榛樿 30銆�
+        //                    shadowBlur: 20,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                }
+        //            },
+        //            splitLine: {			// 鍒嗛殧绾挎牱寮忋��
+        //                show: true,				// 鏄惁鏄剧ず鍒嗛殧绾�,榛樿 true銆�
+        //                length: 0,				// 鍒嗛殧绾跨嚎闀裤�傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 30銆�
+        //                lineStyle: {			// 鍒嗛殧绾挎牱寮忋��
+        //                    color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 2,					//绾垮害,榛樿 2銆�
+        //                    type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+        //                    shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                }
+        //            },
+        //            axisTick: {				// 鍒诲害(绾�)鏍峰紡銆�
+        //                show: false,				// 鏄惁鏄剧ず鍒诲害(绾�),榛樿 true銆�
+        //                splitNumber: 5,			// 鍒嗛殧绾夸箣闂村垎鍓茬殑鍒诲害鏁�,榛樿 5銆�
+        //                length: 8,				// 鍒诲害绾块暱銆傛敮鎸佺浉瀵瑰崐寰勭殑鐧惧垎姣�,榛樿 8銆�
+        //                lineStyle: {			// 鍒诲害绾挎牱寮忋��
+        //                    color: "#eee",				//绾跨殑棰滆壊,榛樿 #eee銆�
+        //                    opacity: 1,					//鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                    width: 1,					//绾垮害,榛樿 1銆�
+        //                    type: "solid",				//绾跨殑绫诲瀷,榛樿 solid銆� 姝ゅ杩樻湁 dashed,dotted
+        //                    shadowBlur: 10,				//(鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                    shadowColor: "#fff",		//闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //                },
+        //            },
+        //            axisLabel: {			// 鍒诲害鏍囩銆�
+        //                show: false,				// 鏄惁鏄剧ず鏍囩,榛樿 true銆�
+        //                distance: 5,			// 鏍囩涓庡埢搴︾嚎鐨勮窛绂�,榛樿 5銆�
+        //                color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #fff銆�
+        //                fontSize: 9,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 5銆�
+        //                formatter: "{value}",	// 鍒诲害鏍囩鐨勫唴瀹规牸寮忓櫒锛屾敮鎸佸瓧绗︿覆妯℃澘鍜屽洖璋冨嚱鏁颁袱绉嶅舰寮忋�� 绀轰緥:// 浣跨敤瀛楃涓叉ā鏉匡紝妯℃澘鍙橀噺涓哄埢搴﹂粯璁ゆ爣绛� {value},濡�:formatter: '{value} kg'; // 浣跨敤鍑芥暟妯℃澘锛屽嚱鏁板弬鏁板垎鍒负鍒诲害鏁板��,濡俧ormatter: function (value) {return value + 'km/h';}
+        //            },
+        //            pointer: {				// 浠〃鐩樻寚閽堛��
+        //                show: true,				// 鏄惁鏄剧ず鎸囬拡,榛樿 true銆�
+        //                length: "70%",			// 鎸囬拡闀垮害锛屽彲浠ユ槸缁濆鏁板�硷紝涔熷彲浠ユ槸鐩稿浜庡崐寰勭殑鐧惧垎姣�,榛樿 80%銆�
+        //                width: 5,				// 鎸囬拡瀹藉害,榛樿 8銆�
+        //            },
+        //            itemStyle: {			// 浠〃鐩樻寚閽堟牱寮忋��
+        //                color: "auto",			// 鎸囬拡棰滆壊锛岄粯璁�(auto)鍙栨暟鍊兼墍鍦ㄧ殑鍖洪棿鐨勯鑹�
+        //                opacity: 1,				// 鍥惧舰閫忔槑搴︺�傛敮鎸佷粠 0 鍒� 1 鐨勬暟瀛楋紝涓� 0 鏃朵笉缁樺埗璇ュ浘褰€��
+        //                borderWidth: 0,			// 鎻忚竟绾垮,榛樿 0銆備负 0 鏃舵棤鎻忚竟銆�
+        //                borderType: "solid",	// 鏌辨潯鐨勬弿杈圭被鍨嬶紝榛樿涓哄疄绾匡紝鏀寔 'solid', 'dashed', 'dotted'銆�
+        //                borderColor: "#000",	// 鍥惧舰鐨勬弿杈归鑹�,榛樿 "#000"銆傛敮鎸佺殑棰滆壊鏍煎紡鍚� color锛屼笉鏀寔鍥炶皟鍑芥暟銆�
+        //                shadowBlur: 10,			// (鍙戝厜鏁堟灉)鍥惧舰闃村奖鐨勬ā绯婂ぇ灏忋�傝灞炴�ч厤鍚� shadowColor,shadowOffsetX, shadowOffsetY 涓�璧疯缃浘褰㈢殑闃村奖鏁堟灉銆�
+        //                shadowColor: "#fff",	// 闃村奖棰滆壊銆傛敮鎸佺殑鏍煎紡鍚宑olor銆�
+        //            },
+        //            emphasis: {				// 楂樹寒鐨� 浠〃鐩樻寚閽堟牱寮�
+        //                itemStyle: {
+        //                    //楂樹寒 鍜屾甯�  涓よ�呭叿鏈夊悓鏍风殑閰嶇疆椤�,鍙槸鍦ㄤ笉鍚岀姸鎬佷笅閰嶇疆椤圭殑鍊间笉鍚屻��
+        //                }
+        //            },
+        //            title: {				// 浠〃鐩樻爣棰樸��
+        //                show: true,				// 鏄惁鏄剧ず鏍囬,榛樿 true銆�
+        //                offsetCenter: [0, "120%"],//鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+        //                color: "#1E1E1E",			// 鏂囧瓧鐨勯鑹�,榛樿 #333銆�
+        //                fontSize: 20,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+        //            },
+        //            detail: {				// 浠〃鐩樿鎯咃紝鐢ㄤ簬鏄剧ず鏁版嵁銆�
+        //                show: true,				// 鏄惁鏄剧ず璇︽儏,榛樿 true銆�
+        //                offsetCenter: [0, "70%"],// 鐩稿浜庝华琛ㄧ洏涓績鐨勫亸绉讳綅缃紝鏁扮粍绗竴椤规槸姘村钩鏂瑰悜鐨勫亸绉伙紝绗簩椤规槸鍨傜洿鏂瑰悜鐨勫亸绉汇�傚彲浠ユ槸缁濆鐨勬暟鍊硷紝涔熷彲浠ユ槸鐩稿浜庝华琛ㄧ洏鍗婂緞鐨勭櫨鍒嗘瘮銆�
+        //                color: "auto",			// 鏂囧瓧鐨勯鑹�,榛樿 auto銆�
+        //                fontSize: 30,			// 鏂囧瓧鐨勫瓧浣撳ぇ灏�,榛樿 15銆�
+        //                formatter: "{value}%",	// 鏍煎紡鍖栧嚱鏁版垨鑰呭瓧绗︿覆
+        //            },
+        //            data: data2
+        //        }
+        //    ]
+        //};
+        //// 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃
+        //chart2.setOption(option2);
 
         //#endregion
 
@@ -788,7 +947,6 @@
                 //缂栬緫
                 case 'set_EditBill': set_EditBill();
                     break;
-
             };
         });
 
@@ -927,7 +1085,6 @@
                 , btn2: function (index, layero) { }
             })
         });
-
         //鎿嶄綔鍛�2
         form.on('submit(btnHEmp2ID)', function () {
             var HOrgID = sessionStorage["OrganizationID"];
@@ -1072,11 +1229,28 @@
         //#endregion
 
         //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+
+
         function set_ClearBill() {
             get_CriticalPartsList();
             $("#HPRDOrgID").val(sessionStorage["OrganizationID"]);
             HDeptID = sessionStorage["HDeptID"];
-            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+            var now = new Date();
+            var currentHour = now.getHours();
+
+            // 鍒ゆ柇鏄惁鍦ㄥ噷鏅� 0:00 鍒版棭涓� 8:00 涔嬮棿
+            if (currentHour >= 0 && currentHour < 8) {
+                // 璁剧疆涓哄墠涓�澶�
+                var yesterday = new Date(now);
+                yesterday.setDate(yesterday.getDate() - 1);
+                $("#HDate").val(Pub_Format(yesterday, "yyyy-MM-dd"));
+            } else {
+                // 璁剧疆涓哄綋澶�
+                $("#HDate").val(Pub_Format(now, "yyyy-MM-dd"));
+            }
+
             $('#Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳绂佺敤
             //get_Display();
             get_Display_OutBillList();
@@ -1086,8 +1260,32 @@
             //鏌ヨ
             get_FastQuery();
             //鑾峰彇褰撳墠鐝
-            get_HWorkShift(HDeptID);           
+            get_HWorkShift(HDeptID);
+
+            // 鍒濆鍖� 鏁板瓧杈撳叆妗� 缁勪欢
+            numinp.init({
+                topBtns: 123,
+                rightBtns: false,
+                listening: true,
+                hideEnd: function () {
+                    calcQty()
+                }
+            })
         }
+
+        //#region 璁＄畻绠辨暟
+        function calcQty() {
+            var HPerQty = $("#HPerQty").val()
+            var HQty = $("#HQty").val()
+            var HPieceQty = $("#HPieceQty").val()
+            // 绠辨暟鍜屾瘡绠辨暟閲忛兘涓嶄负0锛屽垯璁＄畻鍚堟牸鏁伴噺
+            if (HPerQty && HPieceQty) {
+                console.log(HPieceQty * 1.0 * HPerQty)
+                $("#HQty").val(HPieceQty * 1.0 * HPerQty)
+            }
+        }
+        //#endregion
+
 
         //鑾峰彇鏈�澶у崟鎹彿
         function MaxBillNO() {
@@ -1113,27 +1311,11 @@
                 , toolbar: '#toolbarDemo'
                 , page: false
                 , totalRow: true
-                //, cellMinWidth: 120
-                , data: []
                 , height: 780
                 , limit: Number.MAX_VALUE
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { type: 'numbers', title: '搴忓彿' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鏃ユ湡', width: 100 }
-                    , { field: '鐗╂枡浠ｇ爜', title: '浜у搧浠ｇ爜', width: 100 }
-                    , { field: '鐗╂枡鍚嶇О', title: '浜у搧鍚嶇О', width: 100 }
-                    , { field: '鏉＄爜', title: '鏉＄爜', width: 100 }
-                    , { field: '鎿嶄綔鍛�', title: '鎿嶄綔鍛�', width: 150 }
-                    , { field: '鍑虹珯鏁伴噺', title: '鏁伴噺', width: 100 }
-                    , { field: '鐢熶骇璁㈠崟鍙�', title: '璁㈠崟鍙�', width: 100 }
-                ]]
             }
-
-            table.render(options);
-
         }
-        
+
         //鍒犻櫎鍗曟嵁
         function set_DeleteBill() {
             var checkStatus = table.checkStatus('mainTable')
@@ -1180,16 +1362,17 @@
                     , anim: 0
                     , content: ['Cj_StationOutBill.html?OperationType=4&linterid=' + data[0].hmainid + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
                     , resize: false
-                    , cancel: function () {                       
+                    , cancel: function () {
                     }
                     , end: function () {
                         get_Display_OutBillList();
                     }
-                })                
+                })
             } else {
                 layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
             }
         }
+
         //#region 蹇�熻繃婊�
         function get_FastQuery() {
             get_Display(sWhere);
@@ -1304,23 +1487,14 @@
         //#region 鏍规嵁骞虫澘缁戝畾锛岃嚜鍔ㄥ甫鍑哄熀纭�璧勬枡淇℃伅
         function get_ConfigFileInfo_EquipFile() {
             var objdata = get_ConfigFileInfo();
-            //$("#HProcID").val(objdata.HProcID); //宸ュ簭ID
-            //$("#HProcName").val(objdata.HProcName); //宸ュ簭鍚嶇О
-            //$("#HEquipID").val(objdata.HEquipID); //璁惧ID
             $("#HEquipCode").text(objdata.HEquipName); //璁惧鍚嶇О
-            //$("#HSourceID").val(objdata.HSourceID); //鐢熶骇璧勬簮ID
-            //$("#HSourceName").val(objdata.HSourceName); //鐢熶骇璧勬簮鍚嶇О
-            //$("#HGroupID").val(objdata.HGroupID); //鐝粍ID
-            //$("#HGroupName").val(objdata.HGroupName); //鐝粍鍚嶇О
-            //$("#HCenterID").val(objdata.HWorkCenterID); //宸ヤ綔涓績ID
-            //$("#HCenterName").val(objdata.HWorkCenterName); //宸ヤ綔涓績鍚嶇О
 
         }
         //#endregion
 
         //鏌ヨ褰撳墠鐢ㄦ埛浠婂ぉ鐨勫嚭绔欏崟鐨勬暟鎹�
         function get_Display_OutBillList() {
-            sWhere = " and 鍒跺崟浜�='" + sessionStorage["HUserName"] + "' and CONVERT(varchar(10),鍒跺崟鏃ユ湡,20)=CONVERT(varchar(10),GETDATE(),20) ";
+            sWhere = " and 璁惧 ='" + HSourceName + "' and 娴佽浆鍗�='" + HSourceBillNo + "' ";
             //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             var wait = layer.load();
             $.ajax({
@@ -1330,15 +1504,51 @@
                 data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" },
                 success: function (data1) {
                     if (data1.count == 1) {
+                        var titleData = ["hmainid", "鐢熶骇璁㈠崟鍙�", "鍒跺崟浜�", "娴佽浆鍗�", "鏉＄爜", "鐗╂枡浠ｇ爜", "鐝", "璁惧", "宸ュ簭鍚嶇О", "鍑虹珯鏃堕棿"];
+                        var totalArray = [];
+                        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 ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 150 });
+                            }
+                            else {
+                                switch (data[i].Type) {
+                                    //int
+                                    case 'DateTime':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+                                        break;
+                                    case 'long':
+                                    case 'Int32':
+                                    case 'Int64':
+                                    case 'double':
+                                    case 'Decimal':
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 110, totalRow: true });
+                                        break;
+                                    default:
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 240 });
+                                }
+                            }
+                        }
+
+                        options.cols = [col];
                         options.data = data1.data;
                         table.render(options);
                     } else {
-                        layer.alert(data1.Message, { icon: 5 });
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
                     }
-
-                    layer.close(wait);
                 }, error: function () {
-                    layer.close(wait);
+                    layer.close(ajaxLoad);
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
@@ -1469,7 +1679,7 @@
                     return false;
                 }
                 var HBadCount = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0);
-                var HTRQty = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0)+ (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HToCheckQty").val()) || 0); //鎶曞叆鏁伴噺
+                var HTRQty = (parseFloat(newHWasterQty_Work) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HToCheckQty").val()) || 0); //鎶曞叆鏁伴噺
                 $("#HBadCount").val(HBadCount);
                 $("#HTRQty").val(HTRQty);
 
@@ -1511,8 +1721,8 @@
                     layer.msg("鍙栨牱璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛�!");
                     $("#HToCheckQty").val(oldHToCheckQty);
                     return false;
-                }                
-                var HTRQty = (parseFloat(newHToCheckQty) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0)+ (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0); //鎶曞叆鏁伴噺
+                }
+                var HTRQty = (parseFloat(newHToCheckQty) || 0) + (parseFloat($("#HQty").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0); //鎶曞叆鏁伴噺
                 $("#HTRQty").val(HTRQty);
 
             });
@@ -1533,7 +1743,7 @@
                     $("#HQty").val(oldHQty);
                     return false;
                 }
-                var HTRQty = (parseFloat(newHQty) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0)+ (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HToCheckQty").val()) || 0); //鎶曞叆鏁伴噺
+                var HTRQty = (parseFloat(newHQty) || 0) + (parseFloat($("#HWasterQty_Mater").val()) || 0) + (parseFloat($("#HWasterQty_Work").val()) || 0) + (parseFloat($("#HBackWorkQty").val()) || 0) + (parseFloat($("#HToCheckQty").val()) || 0); //鎶曞叆鏁伴噺
                 $("#HTRQty").val(HTRQty);
 
             });
@@ -1556,7 +1766,7 @@
                 layer.msg("涓嶈壇鍜屽悎鏍兼暟閲忎笉鑳藉悓鏃朵负0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return;
             }
-            if ($("#HBackWorkQty").val() =="") {
+            if ($("#HBackWorkQty").val() == "") {
 
                 layer.msg("杩斿伐鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return;
@@ -1571,6 +1781,10 @@
                 layer.msg("鏂欏簾鏁伴噺涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return;
             }
+            if ($("#HPieceQty").val() == "") {
+                layer.msg("绠辨暟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return;
+            }
             var oMain = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"] + ";Add";
             var index = layer.load();
             $.ajax({
@@ -1582,7 +1796,7 @@
                 success: function (data) {
                     if (data.count == 1) {
                         layer.close(index);
-                        SaverSub(oMain);                        
+                        SaverSub(oMain);
                     }
                     else {
                         layer.close(index);
@@ -1610,18 +1824,19 @@
                     if (data.count == 1) {
                         layer.close(index);
                         layer.msg("鎻愪氦鎴愬姛");
-                                              
+
                         if (sessionStorage["Organization"] == "瀹佹尝甯傚崕鑸熷寘瑁呮湁闄愬叕鍙�") {
                             dy_PL1();//璋冪敤鎵撳嵃鏂规硶
                             $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
                             $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
                             get_Display_OutBillList();
+
                         } else {
                             $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤
                             $('#Add').removeClass("layui-btn-disabled").attr("disabled", false);//鏂板鎸夐挳鍚敤
                             get_Display_OutBillList();
                         }
-                        
+
                     }
                     else {
                         layer.close(index);
@@ -1650,14 +1865,13 @@
                         var LoadData = data.data;
                         $("#HShiftsID").val(LoadData[0].HInterID); //褰撳墠宸ュ簭ID
                         $("#HShiftsName").val(LoadData[0].鐝); //褰撳墠宸ュ簭
-                    }                   
+                    }
                 },
                 error: function (err) {
                     layer.alert(err, { icon: 5 });
                 }
             });
         }
-
         //鑾峰彇鏈哄彴绛惧埌瑙掕壊
         function get_HRoulesEmp() {
             $.ajax({
@@ -1688,7 +1902,6 @@
         var num = 0;
 
         //鑷姩鎵撳嵃
-        //鑷姩鎵撳嵃锛堝甫寤惰繜鐗堟湰锛�
         function dy_PL1(rest, tyep) {
             var HInterID = $("#HInterID").val();
             var sWhere = "exec h_p_Cj_StationOutBill_Print_HZ	" + HInterID + ""
@@ -1753,9 +1966,11 @@
             })
         }
 
+
         //浠ヤ笂鏄痩ayui妯″潡
     });
 
+
     //鐢熶骇鐝
     function GetHWorkShiftsValue(obj) {
         $("#HShiftsID").val(obj[0].HInterID); //褰撳墠宸ュ簭ID

--
Gitblit v1.9.1