From 36257012be1cca005b6d228d5115d7ef47250e07 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 27 七月 2022 08:50:05 +0800
Subject: [PATCH] 合并

---
 WebTM/WebTM.csproj.user                                 |    2 
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList_yqn.html   |  349 ++++++
 WebTM/views/Baseset/基础资料/Gy_EmployeeList.html           |    1 
 WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html     |   18 
 WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html        |  389 +++++++
 WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html   |   29 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html   |    2 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user       |   88 
 WebTM/views/销售管理/销售订单/Xs_SeOrderBillDyColList.html      |  327 ++++++
 WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillEdit_yqn.html   |  962 +++++++++++++++++++
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenterDyCol.html         |  245 ++++
 WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html |    8 
 WebTM/views/index.html                                  |    9 
 WebTM/WebTM.csproj                                      |    4 
 WebTM/views/仓存管理/条码库存/KF_ICInventoryByMaterID.html      |  433 +++----
 WebTM/views/基础资料/基础资料/InventoryAnalysis.html            |  117 +
 16 files changed, 2,593 insertions(+), 390 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 71cb572..ee6a9ec 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,23 +5,23 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
-    <History>True|2022-07-01T01:09:47.0947686Z;True|2022-06-30T12:28:33.5694934+08:00;True|2022-06-14T11:19:56.5428784+08:00;True|2022-06-10T13:43:02.7010531+08:00;True|2022-05-13T14:56:55.6031908+08:00;True|2022-04-22T17:26:31.1780137+08:00;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+    <History>True|2022-07-12T05:58:49.8900918Z;True|2022-07-01T09:09:47.0947686+08:00;True|2022-06-30T12:28:33.5694934+08:00;True|2022-06-14T11:19:56.5428784+08:00;True|2022-06-10T13:43:02.7010531+08:00;True|2022-05-13T14:56:55.6031908+08:00;True|2022-04-22T17:26:31.1780137+08:00;True|2022-04-19T16:20:09.8422169+08:00;False|2022-04-12T15:13:02.1028573+08:00;True|2022-04-12T10:54:56.6003263+08:00;False|2022-04-12T10:54:44.4595854+08:00;True|2022-04-11T16:42:06.6793186+08:00;True|2022-04-11T15:52:10.6161563+08:00;True|2022-04-11T15:48:38.0522724+08:00;True|2022-04-11T14:46:47.2397222+08:00;True|2022-04-11T13:42:13.2471726+08:00;True|2022-04-11T09:54:21.2120371+08:00;True|2022-04-11T09:53:01.4026683+08:00;True|2022-04-09T15:08:12.8046566+08:00;True|2022-04-08T17:29:12.2712303+08:00;True|2022-04-07T16:58:40.7699488+08:00;True|2022-03-31T13:52:40.5919602+08:00;True|2022-03-29T14:18:44.9154160+08:00;True|2022-03-29T14:04:02.8789395+08:00;True|2022-03-24T16:36:03.1844780+08:00;True|2022-03-24T15:14:25.9824865+08:00;True|2022-03-10T14:00:50.3507784+08:00;True|2022-03-10T13:45:53.4199601+08:00;True|2022-03-10T13:41:55.2901210+08:00;True|2022-03-10T13:37:38.3845563+08:00;True|2022-03-10T13:37:18.6380311+08:00;True|2022-03-10T11:20:33.5740394+08:00;True|2022-03-10T11:16:05.0743574+08:00;True|2022-03-10T10:12:34.0752504+08:00;True|2022-03-10T09:56:28.4760822+08:00;True|2022-03-10T09:37:30.8502429+08:00;True|2022-03-10T09:35:00.1459659+08:00;True|2022-03-10T09:18:16.6966633+08:00;True|2022-03-10T08:51:48.4580343+08:00;True|2022-03-10T08:51:28.7430996+08:00;True|2022-03-09T13:56:34.8226030+08:00;True|2022-03-09T13:54:10.9929053+08:00;True|2022-03-08T17:09:50.5197523+08:00;True|2022-03-08T17:07:15.6898210+08:00;False|2022-03-08T17:06:54.8474632+08:00;True|2022-03-08T15:20:38.0722005+08:00;True|2022-03-08T15:00:33.6132118+08:00;True|2022-03-08T14:27:19.1639943+08:00;True|2022-03-08T13:57:28.7308630+08:00;True|2022-03-08T13:42:47.2978985+08:00;True|2022-03-08T13:30:36.9292512+08:00;True|2022-03-08T13:29:52.7918602+08:00;True|2022-03-08T13:26:57.2910717+08:00;True|2022-03-08T13:23:04.5379987+08:00;True|2022-02-28T10:54:57.0263525+08:00;True|2022-02-24T15:31:40.9685096+08:00;True|2022-02-23T09:07:35.4584877+08:00;True|2022-02-23T09:05:25.7591771+08:00;True|2022-02-23T08:51:51.2340892+08:00;True|2022-02-21T10:15:01.5497579+08:00;True|2022-02-15T09:07:20.7943263+08:00;True|2022-02-11T10:22:12.4002612+08:00;True|2022-02-10T10:53:03.0296330+08:00;True|2022-02-10T10:51:57.7758881+08:00;True|2022-02-10T10:48:18.3142477+08:00;True|2022-02-10T10:40:13.1440694+08:00;True|2022-02-10T10:24:00.5041469+08:00;True|2022-02-10T10:20:13.4669850+08:00;True|2022-02-10T10:16:46.3841234+08:00;True|2022-02-10T10:00:28.0914087+08:00;True|2022-02-10T09:55:37.5234475+08:00;True|2022-02-10T09:46:36.6817748+08:00;True|2022-02-10T09:42:17.8207976+08:00;True|2022-02-10T09:27:34.2967366+08:00;True|2022-02-10T09:22:05.2900030+08:00;True|2022-02-10T09:15:13.0763532+08:00;True|2022-02-09T15:49:48.7828455+08:00;True|2022-02-09T15:49:12.6486510+08:00;True|2022-02-09T14:13:20.0662033+08:00;True|2022-02-07T22:11:15.6807755+08:00;True|2022-01-21T13:55:38.5960348+08:00;True|2022-01-21T13:35:44.5448951+08:00;True|2022-01-21T11:17:58.4170192+08:00;True|2022-01-21T11:16:17.6980618+08:00;True|2022-01-21T11:03:25.8507147+08:00;True|2022-01-21T11:01:15.9424492+08:00;True|2022-01-21T10:56:37.1625788+08:00;True|2022-01-21T10:53:45.3657250+08:00;True|2022-01-21T10:46:22.6669947+08:00;True|2022-01-21T10:45:04.4118587+08:00;True|2022-01-21T10:41:54.7072355+08:00;True|2022-01-20T13:39:44.5738057+08:00;True|2022-01-18T09:18:23.0953685+08:00;True|2022-01-15T11:06:39.7809167+08:00;True|2022-01-14T18:59:11.1201332+08:00;True|2022-01-11T15:11:43.6994251+08:00;True|2022-01-10T20:26:01.9642570+08:00;True|2022-01-10T20:25:16.2747611+08:00;True|2022-01-10T20:24:02.1619078+08:00;True|2022-01-10T20:13:59.7024855+08:00;True|2022-01-07T10:58:16.5396273+08:00;True|2021-12-28T20:35:03.8417289+08:00;True|2021-12-28T19:36:35.9687073+08:00;True|2021-12-28T14:36:01.0212247+08:00;True|2021-12-28T14:31:11.2750876+08:00;True|2021-12-28T14:27:26.0102235+08:00;True|2021-12-28T14:19:50.6045053+08:00;True|2021-12-28T13:50:11.7600252+08:00;True|2021-12-27T13:29:04.7872023+08:00;True|2021-12-25T15:16:16.4137424+08:00;True|2021-12-25T14:53:38.7023659+08:00;True|2021-12-25T14:51:21.3707758+08:00;True|2021-12-25T14:50:23.4919970+08:00;True|2021-12-25T14:34:45.9167760+08:00;True|2021-12-25T13:51:06.6825462+08:00;True|2021-12-25T13:44:48.6348556+08:00;True|2021-12-25T13:41:38.6849398+08:00;True|2021-12-25T13:38:37.2507358+08:00;True|2021-12-25T13:38:16.0716131+08:00;True|2021-12-24T16:18:46.2402537+08:00;True|2021-11-08T09:19:14.7927869+08:00;True|2021-11-05T15:51:16.8422280+08:00;True|2021-11-05T15:46:53.0276715+08:00;True|2021-11-05T15:45:27.8318584+08:00;True|2021-11-05T15:41:35.9009415+08:00;True|2021-11-01T17:03:51.5854759+08:00;True|2021-11-01T16:13:09.6210948+08:00;True|2021-11-01T14:51:00.7022992+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/style/admin.css">
       <publishTime>12/23/2021 16:07:32</publishTime>
     </File>
     <File Include="bin/layuiadmin/style/login.css">
-      <publishTime>12/23/2021 16:07:32</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>01/28/2016 14:22:24</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>07/18/2022 18:18:01</publishTime>
+      <publishTime>07/18/2022 17:47:07</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>07/18/2022 18:18:01</publishTime>
+      <publishTime>07/18/2022 17:47:07</publishTime>
     </File>
     <File Include="HtmlPage1.html">
       <publishTime>03/14/2022 15:07:22</publishTime>
@@ -660,7 +660,7 @@
       <publishTime>12/23/2021 16:07:31</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>07/18/2022 18:25:32</publishTime>
+      <publishTime>07/07/2022 15:47:53</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1230,13 +1230,13 @@
       <publishTime>12/23/2021 16:07:32</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/08/2022 18:21:53</publishTime>
     </File>
     <File Include="views/indexMenu.html">
       <publishTime>03/10/2022 14:55:22</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>07/06/2022 10:43:44</publishTime>
+      <publishTime>07/08/2022 16:58:50</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -1530,13 +1530,13 @@
       <publishTime>05/16/2022 13:49:35</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>07/18/2022 18:14:15</publishTime>
+      <publishTime>07/07/2022 17:13:18</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
-      <publishTime>07/18/2022 09:26:42</publishTime>
+      <publishTime>07/02/2022 12:19:41</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockOutBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:12:28</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockRequestBillList.html">
       <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1560,10 +1560,10 @@
       <publishTime>03/10/2022 14:55:22</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鏉$爜鍑哄叆搴撹褰曡〃/KF_PonderationBillList_Query.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/08/2022 19:43:20</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryByMaterID.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 13:07:47</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/鏉$爜搴撳瓨/KF_ICInventoryList_WMS.html">
       <publishTime>03/10/2022 14:55:22</publishTime>
@@ -1998,7 +1998,7 @@
       <publishTime>06/30/2022 10:10:01</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/InventoryAnalysis.html">
-      <publishTime>06/30/2022 10:10:01</publishTime>
+      <publishTime>07/18/2022 17:44:39</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Sc_MouldStockBillMain_Temp.html">
       <publishTime>04/14/2022 09:22:30</publishTime>
@@ -2157,7 +2157,7 @@
       <publishTime>03/10/2022 14:55:22</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/05/2022 15:37:55</publishTime>
     </File>
     <File Include="views/宸ヨ祫绠$悊/Gy_DuSubsidyItemBillEdit.html">
       <publishTime>01/23/2022 20:32:28</publishTime>
@@ -2184,10 +2184,10 @@
       <publishTime>10/19/2021 09:27:19</publishTime>
     </File>
     <File Include="views/宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillEdit.html">
-      <publishTime>07/07/2022 15:43:14</publishTime>
+      <publishTime>07/07/2022 15:44:24</publishTime>
     </File>
     <File Include="views/宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillList.html">
-      <publishTime>07/07/2022 15:43:14</publishTime>
+      <publishTime>07/07/2022 15:44:24</publishTime>
     </File>
     <File Include="views/宸ヨ祫绠$悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Kf_BarCodeEditDlg.html">
       <publishTime>09/27/2021 10:40:02</publishTime>
@@ -2343,7 +2343,7 @@
       <publishTime>04/14/2022 09:22:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
-      <publishTime>03/10/2022 14:55:22</publishTime>
+      <publishTime>07/14/2022 10:48:23</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
       <publishTime>04/14/2022 09:22:30</publishTime>
@@ -2412,7 +2412,7 @@
       <publishTime>09/13/2021 10:11:41</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/12/2022 09:16:52</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
       <publishTime>06/30/2022 10:10:01</publishTime>
@@ -2877,7 +2877,7 @@
       <publishTime>04/14/2022 09:22:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:04:05</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html">
       <publishTime>06/30/2022 10:10:01</publishTime>
@@ -2895,7 +2895,7 @@
       <publishTime>03/10/2022 14:55:22</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNew.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:06:33</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBill_FastNewList.html">
       <publishTime>04/21/2022 13:46:59</publishTime>
@@ -3456,13 +3456,13 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Check.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:14:07</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:14:37</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:20:12</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍒嗘寮忚皟鍑哄崟/Fb_StepFoldOutBillList.html">
       <publishTime>03/10/2022 14:55:23</publishTime>
@@ -3480,19 +3480,19 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:08:25</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
       <publishTime>01/02/2022 22:16:06</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Check.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 13:05:57</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 15:00:07</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_FastList.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3504,10 +3504,10 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
-      <publishTime>07/18/2022 18:14:15</publishTime>
+      <publishTime>07/07/2022 15:44:24</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
-      <publishTime>07/18/2022 09:26:42</publishTime>
+      <publishTime>07/02/2022 12:22:47</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBillEdit.html">
       <publishTime>06/30/2022 10:10:01</publishTime>
@@ -3516,7 +3516,7 @@
       <publishTime>06/30/2022 10:10:01</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:02:07</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_FastList.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
@@ -3537,16 +3537,16 @@
       <publishTime>05/10/2022 14:18:08</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:02:48</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastCheck.html">
       <publishTime>04/28/2022 16:51:10</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:19:19</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:10:37</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBillList.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3558,10 +3558,10 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:15:10</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:22:01</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Xs_SeOrderPickUp_New.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3579,10 +3579,10 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
-      <publishTime>07/18/2022 17:45:10</publishTime>
+      <publishTime>07/07/2022 17:16:53</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
-      <publishTime>07/18/2022 17:46:03</publishTime>
+      <publishTime>07/06/2022 16:02:47</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherOutBill_CheckList_New.html">
       <publishTime>04/08/2022 13:12:51</publishTime>
@@ -3591,13 +3591,13 @@
       <publishTime>04/08/2022 13:17:45</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_RedOtherInBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 15:00:03</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:11:17</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
       <publishTime>03/10/2022 14:55:23</publishTime>
@@ -3609,10 +3609,10 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:16:43</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:20:45</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/qrscan.js">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3630,10 +3630,10 @@
       <publishTime>03/10/2022 14:55:23</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html">
-      <publishTime>07/12/2022 11:19:28</publishTime>
+      <publishTime>07/07/2022 17:10:16</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:19:00</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustOutBackBill.html">
       <publishTime>12/23/2021 16:07:32</publishTime>
@@ -3642,10 +3642,10 @@
       <publishTime>05/07/2022 15:04:43</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
-      <publishTime>07/06/2022 10:43:43</publishTime>
+      <publishTime>07/02/2022 12:18:34</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>07/18/2022 18:18:08</publishTime>
+      <publishTime>07/18/2022 17:47:24</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 677b625..2f9c029 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -160,6 +160,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkPayType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Pay_PeriodInfoSet.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenterDyCol.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkPayType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Pay_PeriodInfoSet.html" />
@@ -726,7 +727,9 @@
     <Content Include="views\宸ヨ祫绠$悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillEdit.html" />
     <Content Include="views\宸ヨ祫绠$悊\鐝粍鑱屽憳娓呭崟\Gy_GroupEmpBillList.html" />
+    <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit_yqn.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillEdit.html" />
+    <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList_yqn.html" />
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportInventoryAccount.html" />
     <Content Include="views\妯℃不鍏风鐞哱鍣ㄥ叿鎶ヨ〃\ReportMaterialReceipt.html" />
@@ -979,6 +982,7 @@
     <Content Include="views\閲囪喘绠$悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturnList.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘閫�鏂欏崟\Cg_PurchaseReturn_Add_Up.html" />
     <Content Include="views\閿�鍞鐞哱鍙戣揣閫氱煡鍗昞Add_Edit_Xs_SeOutStockBillList.html" />
+    <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillDyColList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Add_Edit_Kf_ICStockBillMainList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBillMainList.html" />
     <Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..87674ea 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 5654ede..23f3bfb 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -101,6 +101,7 @@
                 , { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
                 , { field: 'HNumber', width: 150, title: '鑱屽憳浠g爜' }
                 , { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
+                , { field: 'HEmpRate', width: 150, title: '鑱屽憳绯绘暟', sort: true }
               ]]
               , page: true
             });
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index d84793b..56f91a1 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -492,7 +492,7 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/閫�鏂欑敵璇峰崟/JIT_CallGoodsBackRequestBillList.html">閫�鏂欑敵璇峰崟鍒楄〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
                                         <dd><a lay-href="杞﹂棿绠$悊/杞﹂棿鏀舵枡/JIT_SendGoodsBillList.html">杞﹂棿鏀舵枡鍒楄〃</a></dd>
-                                        <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃(-)</a></dd>
+                                        <!--<dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鎷f枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷f枡閰嶉�佸崟鍒楄〃(-)</a></dd>-->
                                         <dd><a lay-href="杞﹂棿绠$悊/鍙枡绠$悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
                                     </dl>
                                 </dd>
@@ -753,6 +753,13 @@
                                     </dl>
                                 </dd>
                                 <dd>
+                                    <a>鑰冨嫟姹囨姤鍗昣闆呯惇璇�</a>
+                                    <dl class="layui-nav-child">
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html">鑰冨嫟姹囨姤鍗�</a></dd>
+                                        <dd><a lay-href="宸ヨ祫绠$悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">鑰冨嫟姹囨姤鍗曠淮鎶�</a></dd>
+                                    </dl>
+                                </dd>
+                                <dd>
                                     <a>鎵hˉ璧勬枡</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="宸ヨ祫绠$悊/Gy_DuSubsidyItemBillList.html">鎵hˉ宸ヨ祫璧勬枡缁存姢</a></dd>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
index 93d311a..cd43e84 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryByMaterID.html"
@@ -30,12 +30,11 @@
                     </div>
                     <div class="layui-tab layui-col-xs12" lay-filter="tab-ProductlnBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
-                            <li lay-id="1" style="padding:1px;" class="layui-this">浠撳簱淇℃伅</li>
+                            <li lay-id="1" style="padding:1px;" >浠撳簱淇℃伅</li>
                             <li lay-id="2" style="padding:1px;">搴撳瓨淇℃伅</li>
-                            <!--<li lay-id="5">鏃ュ織</li>-->
                         </ul>
                         <div class="layui-tab-content">
-                            <div class="layui-tab-item">
+                            <div class="layui-tab-item   layui-show">
                                 <div class="layui-form-item" style="padding:0px;margin:0px">
                                     <div class="layui-row">
                                         <div class="layui-col-xs3">
@@ -60,48 +59,19 @@
                                             <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
                                         </div>
                                         <div class="layui-col-xs3">
-                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
+                                            <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                             <div class="layui-tab-item">
-                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
-                            </div>
-                            <div class="layui-tab-item">
-                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
+                                <table class="" id="wl-table" lay-filter="wl-table"></table>
                             </div>
                         </div>
-                        <!--<div class="layui-form-item" style="margin-bottom: 20px;">
-                            <div class="layui-row">
-                                <div class="layui-col-xs3">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
-                                </div>
-                                <div class="layui-col-xs3">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">缂栬緫</button>
-                                </div>
-                                <div class="layui-col-xs3">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">鍒犻櫎</button>
-                                </div>
-                                <div class="layui-col-xs3">
-                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                                </div>
-                            </div>
-                        </div>-->
                     </div>
                     <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
                         <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鏌ヨ</button>
                         <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs" hidden controls>
-                            <source src="../../video/jingbao.wav" type="audio/ogg">
-                        </audio>
-                    </div>
-                    <div id="" style="display:none;">
-                        <audio id="cs2" hidden controls>
-                            <source src="../../video/success.wav" type="audio/ogg">
-                        </audio>
                     </div>
                 </form>
             </div>
@@ -124,49 +94,67 @@
                 , form = layui.form
                 , element = layui.element;
 
-
             var option = [];
+            var col = [];
+
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            if (sessionStorage.login != "login") {
+                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                }, function () { window.location.href = "../../user/login.html"; });
+            }
+
+            var params = getUrlVars();
+            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+
+
+
+            //鑾峰彇鍙傛暟
+            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;
+            }
 
 
             //娓呯┖鐣岄潰  new
 
             //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 new
-            //$("#HWHID").val(sessionStorage["HWHID"]);
-            //$("#HWHNAME").val(sessionStorage["HWHName"]);
-            //$("#HStockPlaceID").val(sessionStorage["HSPID"]);
-            //$("#HStockPlaceName").val(sessionStorage["HSPName"]);
-            ////$("#HSupID").val(sessionStorage["HSupID"]);
-            ////$("#HSupName").val(sessionStorage["HSupName"]);
-            //$("#HDeptID").val(sessionStorage["HDeptID"]);
-            //$("#HDeptName").val(sessionStorage["HDept"]);
-            //$("#HSecManagerID").val(sessionStorage["HSecManagerID"]);
-            //$("#HSecManager").val(sessionStorage["HSecManager"]);
-            //$("#HKeeperID").val(sessionStorage["HKeeperID"]);
-            //$("#HKeeper").val(sessionStorage["HKeeper"]);
-            //$("#HMaker").val(sessionStorage["HUserName"]);
-            //$("#HMaker").hide();
-            //$("#HMakerID").hide();
-            //$("#HBillerID").val(sessionStorage["HBillerID"]);
-            //$("#HBillerID").hide();
-            //var HSourceFlag = sessionStorage["SourceFlag"];
-            //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new
-
+            $("#HWHID").val(sessionStorage["HWHID"]);
+            $("#HWHNAME").val(sessionStorage["HWHName"]);
+            $("#HStockPlaceID").val(sessionStorage["HSPID"]);
+            $("#HStockPlaceName").val(sessionStorage["HSPName"]);
             $("#HBarCode").focus();
 
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                    set_InitGrid();
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
 
+            }
 
             //鍒濆鍖栨槑缁嗚〃鏍�
             function set_InitGrid() {
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { field: 'HQty', title: '鏁伴噺', width: 150 }
+                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
                     , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
                     , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
                     , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                    , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
                     , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
+                    , { field: 'HPackNum', title: '绠辨暟', width: 150 }
+                    , { field: 'HSPackNum', title: '鎵樻暟', width: 150 }
                     , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
+                    , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
                     , { field: 'HWHName', title: '浠撳簱', width: 150}
                     , { field: 'HWhID', title: 'HWhID', width: 150, hide: true }
                     , { field: 'HSPName', title: '浠撲綅', width: 150 }
@@ -187,119 +175,6 @@
                 };
             }
 
-            //鑾峰彇鍙傛暟
-            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;
-            }
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
-            }
-
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-            //function  RoadBillMain(linterid)//鍔犺浇琛ㄥご
-            //{
-            //    $.ajax({
-            //        url: GetWEBURL() + "/Web/GetPonderationBill",
-            //        type: "GET",
-            //        data: { "HInterID": linterid },
-            //        success: function (d) {
-            //            // console.log(d.data);
-            //            $("#HInterID").val(d.data[0].HInterID);
-            //            $("#HBillNo").val(d.data[0].HBillNo);
-            //            $("#HBillType").val(d.data[0].HSourceBillType);
-            //            $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-            //            //$("#HWHID").val(d.data[0].HWhID);
-            //            //$("#HStockPlaceID").val(d.data[0].HSPID);
-            //            //$("#HKeeperID").val(d.data[0].HKeeperID);
-            //            //$("#HSecManagerID").val(d.data[0].HSecManagerID);
-            //            HSourceFlag = true;
-            //        }
-            //    })
-            //}
-
-
-            //function RoadBillSub(linterid)//鍔犺浇琛ㄤ綋
-            //{
-            //    $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
-            //    //缂栬緫鍔犺浇鏁版嵁
-            //    var sInterID = $("#HInterID").val();
-            //    table.render({
-            //        elem: '#wl-table'
-            //        //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
-            //        , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
-            //        , toolbar: '#toolbarDemo'
-            //        , defaultToolbar: []
-            //        , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
-            //        , cols: [[
-            //              { type: 'radio' }
-            //            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-            //            , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 }
-            //            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-            //            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-            //            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-            //            , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
-            //            , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
-            //            , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
-            //            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-            //        ]]
-            //        // , data: [linterid]
-            //        // , page: true
-            //        , height: 500
-            //        , done: function () {
-            //            layer.closeAll("loading");
-            //        }
-            //    });
-            //}
-
-            //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-
-
-
-
-
-
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
-
-                set_InitGrid();
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-
-            }
-
-
-            //杩涘叆鐗╂枡鏄庣粏椤电銆佹潯鐮佹 鍏夋爣鐒︾偣   new
-            //if (1 == 2)
-            //{
-            //    element.tabChange('tab-ProductlnBill', '3');
-            //    var pFocus = $("#HBarCode");
-            //    pFocus.focus();
-            //    pFocus.select();
-            //}
-            //else
-            //{
-            //    element.tabChange('tab-ProductlnBill', '1');
-            //    var pFocus = $("#HSourceBillNo");
-            //    pFocus.focus();
-            //    pFocus.select();
-            //}
-            //
-            //
 
             //閫夋嫨浠撳簱
             form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
@@ -312,8 +187,27 @@
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
                     , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    ,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].HName);
+                        $("#HWHID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 })
             });
@@ -329,8 +223,27 @@
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + sessionStorage["HWHID"] + '&Type=HSpID', 'yes']
                     , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , 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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HStockPlaceName").val(checkStatus.data[0].HName);
+                        $("#HStockPlaceID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 })
             });
@@ -348,36 +261,55 @@
 
             //鏌ヨ
             form.on('submit(Saver)', function (data) {//鏌ヨ
-                var sHWHID = $("#HWHID").val()
-                var sHSPID = $("#HStockPlaceID").val()
-                layer.load(3)
-                table.render({
-                    elem: '#wl-table'
-                    , url: GetWEBURL() + '/KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack'
-                    , toolbar: '#toolbarDemo'
-                    , defaultToolbar: []
-                    , where: { HBarCode: '', sHWHID: sHWHID, sHSPID: sHSPID, HOWNERID: sessionStorage["OrganizationID"], sWhere: '' }
-                    , cols: [[
-                        { type: 'radio' }
-                        , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                        , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                        , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                        , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                        , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
-                        , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                        , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                        , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
-                        , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                        , { field: 'HWhID', title: 'HWhID', width: 150, hide: true }
-                        , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                        , { field: 'HSPID', title: 'HSPID', width: 150, hide: true }
-                        , { field: 'HOWNERName', title: '缁勭粐', width: 150 }
-                    ]]
-                    // , data: [linterid]
-                    // , page: true
-                    , height: 500
-                    , done: function () {
-                        layer.closeAll("loading");
+                var sHWHID = $("#HWHID").val();
+                var sHSPID = $("#HStockPlaceID").val();
+                layer.load(3);
+                $.ajax({
+                    url: GetWEBURL() + '/KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1',
+                    type: "GET",
+                    data: { "HBarCode": '', "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": sessionStorage["OrganizationID"], "sWhere": '' },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+
+                            for (var i = 0; i < data.length; i++) {
+                                if (data[i].name == '鐗╂枡ID' || data[i].name == '杈呭姪灞炴�D' || data[i].name == '浠撳簱ID' || data[i].name == '浠撲綅ID') {
+                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        //int
+                                        case 'DateTime':
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+
+                            //鍔ㄦ�佹樉绀哄垪鍚�
+                            table.render({
+                                elem: '#wl-table'
+                                , cols: [col]
+                                , data: data1.data
+                                , height: 550
+                                , page: true
+                                , cellMinWidth: 90
+                                , limit: 50
+                                , limits: [50, 500, 5000, 20000]
+                            });
+
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
                 layer.closeAll("loading");
@@ -396,9 +328,9 @@
 
             //鏌ヨ鏉$爜搴撳瓨
             $('#HBarCode').on('keydown', function (event) {  //鏌ヨ鏉$爜搴撳瓨
-                var HBarCode = $('#HBarCode').val()
-                var sHWHID = $("#HWHID").val()
-                var sHSPID = $("#HStockPlaceID").val()
+                var HBarCode = $('#HBarCode').val();
+                var sHWHID = $("#HWHID").val();
+                var sHSPID = $("#HStockPlaceID").val();
                 if (event.keyCode == 13) {
                     var HBarCode = $('#HBarCode').val()
                     //var Flag = sessionStorage["SourceFlag"];
@@ -411,59 +343,70 @@
                     if (HBarCode != "") {
                         $('#HBarCode').val("");
                     }
-                    layer.load(3)
-                    table.render({
-                        elem: '#wl-table'
-                        , url: GetWEBURL() + '/KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack'
-                        , toolbar: '#toolbarDemo'
-                        , defaultToolbar: []
-                        , where: { HBarCode: HBarCode, sHWHID: sHWHID, sHSPID: sHSPID, HOWNERID: sessionStorage["OrganizationID"], sWhere: '' }
-                        , cols: [[
-                            { type: 'radio' }
-                            , { field: 'HQty', title: '鏁伴噺', width: 150 }
-                            , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 }
-                            , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
-                            , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
-                            , { field: 'HMaterID', title: '鐗╂枡ID', width: 150, hide: true }
-                            , { field: 'HBatchNo', title: '鎵规', width: 150 }
-                            , { field: 'HAuxPropName', title: '杈呭姪灞炴��', width: 150 }
-                            , { field: 'HAuxPropID', title: 'HAuxPropID', width: 150, hide: true }
-                            , { field: 'HWHName', title: '浠撳簱', width: 150 }
-                            , { field: 'HWhID', title: 'HWhID', width: 150, hide: true }
-                            , { field: 'HSPName', title: '浠撲綅', width: 150 }
-                            , { field: 'HSPID', title: 'HSPID', width: 150, hide: true }
-                            , { field: 'HOWNERName', title: '缁勭粐', width: 150 }
-                        ]]
-                        // , data: [linterid]
-                        // , page: true
-                        , height: 500
-                        , done: function () {
-                            layer.closeAll("loading");
+                    layer.load(3);
+                    $.ajax({
+                        url: GetWEBURL() + '/KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1',
+                        type: "GET",
+                        data: { "HBarCode": HBarCode, "sHWHID": sHWHID, "sHSPID": sHSPID, "HOWNERID": sessionStorage["OrganizationID"], "sWhere": '' },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                var data = [];
+                                //缁欑┖鐨勬暟缁勮祴鍊�
+                                for (var key in data1.list) {
+                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                                }
+
+                                for (var i = 0; i < data.length; i++) {
+                                    if (data[i].name == '鐗╂枡ID' || data[i].name == '杈呭姪灞炴�D' || data[i].name == '浠撳簱ID' || data[i].name == '浠撲綅ID') {
+                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+                                    }
+                                    else {
+                                        switch (data[i].Type) {
+                                            //int
+                                            case 'DateTime':
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                                break;
+                                            default:
+                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                        }
+                                    }
+                                }
+
+                                //鍔ㄦ�佹樉绀哄垪鍚�
+                                table.render({
+                                    elem: '#wl-table'
+                                    , cols: [col]
+                                    , data: data1.data
+                                    , height: 550
+                                    , page: true
+                                    , cellMinWidth: 90
+                                    , limit: 50
+                                    , limits: [50, 500, 5000, 20000]
+                                });
+
+                                //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            } else {
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                         }
                     });
                     layer.closeAll("loading");
                 }
             });
 
+            
+
 
             function playSound() {
                 console.log("playSound");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/jingbao.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src","../../video/jingbao.wav")
                 var audio = document.getElementById("cs");
                 audio.play();
             }
 
             function playSound1() {
                 console.log("playSound1");
-                //var audio = document.getElementById("cs");
-                //$("appendAut").html("");
-                //if (audio == null)
-                //$("appendAut").append('<audio id="cs" hidden controls> <source src = "../../video/success.wav" type = "audio/ogg"> </audio >');
-                //$("appendAut").attr("src", "../../video/success.wav")
                 var audio = document.getElementById("cs2");
                 audio.play();
             }
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_WorkCenterDyCol.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_WorkCenterDyCol.html"
new file mode 100644
index 0000000..b878b7e
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenterDyCol.html"
@@ -0,0 +1,245 @@
+锘�<!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>
+
+</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-inline">
+                                    <label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" 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">
+                                            <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+                                        </select>
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], 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
+                , tree = layui.tree
+                , util = layui.util
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(2);
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                Organ();
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                //get_FastQuery(1);
+                get_Display("");
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                };
+            }
+            //#endregion
+
+            //鑾峰彇缁勭粐
+            function Organ() {
+                //鑾峰彇鐧诲綍椤电粍缁囧垪
+                $.ajax({
+                    type: "get",
+                    url: GetWEBURL() + "/Web/GetOrganizations",
+                    success: function (result) {
+                        var Organization = "";
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data;
+                            for (var i = 0; i < data.length; i++) {
+                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+                            }
+                            $("#HOrgID").append(Organization);
+                            $("#HOrgID").val(sessionStorage["OrganizationID"])
+                            form.render('select');
+                        }
+                        layer.closeAll("loading");
+                    }
+                })
+            }
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkCenter/Gy_WorkCenterDyCollist',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": "admin" },//sessionStorage["HUserName"]
+                    success: function (data1) {
+                        var col = [];
+                        if (data1.count == 1) {
+                            var data = [];
+                            //缁欑┖鐨勬暟缁勮祴鍊�
+                            for (var key in data1.list) {
+                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+                            }
+                            //鍒ゆ柇鏄惁鏄函鑻辨枃
+                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
+                            for (var i = 0; i < data.length; i++) {
+                                if (!patrn.test(data[i].name)) {
+                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+                                }
+                                else {
+                                    switch (data[i].Type) {
+                                        case 'DateTime':
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+                                            break;
+                                        default:
+                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 200 });
+                                    }
+                                }
+                            }
+                            option.cols = [col];
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(number) {
+                var HOrgID = "";
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (number == 1) {
+                    HOrgID = sessionStorage["OrganizationID"];
+                }
+                else {
+                    HOrgID = $("#HOrgID").val();//缁勭粐
+                }
+
+                if (HNumber) {
+                    sWhere += " and 宸ヤ綔涓績浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ヤ綔涓績鍚嶇О like '%" + HName + "%'";
+                }
+                if (HOrgID) {
+                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HOrgID").val(sessionStorage["OrganizationID"]);
+                form.render('select');
+                sWhere = "";
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+            //#endregion
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index c94e825..24ac700 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -217,22 +217,7 @@
             set_ClearBill();
             //#endregion
 
-            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-            //#region 澶村伐鍏锋爮浜嬩欢 姝e父
-            table.on('toolbar(mainTable1)', function (obj) {
-                switch (obj.event) {
-                    //瀹℃牳
-                    case 'btn-Check1': set_CheckBill1();
-                        break;
-                    //鍒锋柊
-                    case 'btn-Refresh1': set_ClearQuery();;
-                        break;
-                    //閫�鍑烘寜閽�
-                    case 'btn-Exit1': Pub_Close1(2);
-                        break;
-                };
-            });
-            //#endregion
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛� 
             //#region 澶村伐鍏锋爮浜嬩欢 璋冩嫧
             table.on('toolbar(mainTable2)', function (obj) {
                 switch (obj.event) {
@@ -327,22 +312,71 @@
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch1)', function (data) {
                 var HItemID = $("#HItemID").val();//鐩樼偣
-                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-                $.ajax({
-                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
-                    type: "GET",
-                    data: { "sWhere": sWhere, "sID": HItemID },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option1.data = data1.list[0];
-                            table1.render(option1);
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
+                if (HItemID) {
+                    //鐩樼偣鍒嗘瀽鍒楄〃鍒ゆ柇褰撳墠閫夋嫨鐨勭洏鐐规柟妗堟槸鍚︾敓鎴愯繃鍗曟嵁
+                    $.ajax({
+                        url: GetWEBURL() + 'Gy_StockCheckItemBill/StockItemSubIsExistence',
+                        type: "GET",
+                        data: { "sID": HItemID },
+                        success: function (data1) {
+                            if (data1.count == 0) {
+                                layer.confirm('鏆傛湭鐢熸垚杩囧搴旂洏鐐规柟妗堟暟鎹紝鏄惁鐢熸垚锛�', {
+                                    icon: 3,
+                                    title: "鎻愮ず",
+                                    btn: ['纭畾', '鍙栨秷'],
+                                    submit: function (index) {
+                                        //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                                        $.ajax({
+                                            url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
+                                            type: "GET",
+                                            data: { "sWhere": sWhere, "sID": HItemID },
+                                            success: function (data1) {
+                                                if (data1.count == 1) {
+                                                    option1.data = data1.list[0];
+                                                    table1.render(option1);
+                                                } else {
+                                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                                }
+                                            },
+                                            error: function () {
+                                                layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                                            }
+                                        });
+                                    },
+                                    cancel: function (index, layero) {
+                                        layer.close(index);
+                                        location.reload();
+                                    }
+                                });
+                                
+                            }
+                            else {
+                                $.ajax({
+                                    url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
+                                    type: "GET",
+                                    data: { "sWhere": sWhere, "sID": HItemID },
+                                    success: function (data1) {
+                                        if (data1.count == 1) {
+                                            option1.data = data1.list[0];
+                                            table1.render(option1);
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                                    }
+                                });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                         }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
+                    });
+                    
+                }
+                else {
+                    layer.msg("璇烽�夋嫨鐩樼偣鏂规");
+                    return;
+                }
             });
 
             // 閲嶇疆鎸夐挳
@@ -461,9 +495,8 @@
                 set_InitGrid6();
                 //鍒濆鍖栬〃鏍�(閫�搴�)
                 set_InitGrid7();
-                //鏌ヨ
+                //鍒濆鏌ユ甯搁〉绛�
                 zc_Display();
-
             }
 
             //鍒濆鍖栬〃鏍�(姝e父)
@@ -616,7 +649,7 @@
             }
             //璋冩嫧鏌ヨ
             function db_Display() {
-                var sWhere = " HRealPotType=HBookPotType and HRealPotType='浠撳簱' and HRealPot!=HBookPot";
+                var sWhere = " HRealPotType=HBookPotType and HRealPotType=''浠撳簱'' and HRealPot!=HBookPot";
                 var HItemID = $("#HItemID").val();//鐩樼偣
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
@@ -637,8 +670,9 @@
             }
             //鍑哄簱鏌ヨ
             function ck_Display() {
-                var sWhere = " HBookPotType='浠撳簱' and isnull(HBookPot,'')!='' and (HRealPotType='渚涘簲鍟�' or HRealPotType='瀹㈡埛') and isnull(HRealPot,'')!=''";
+                var sWhere = " HBookPotType=''浠撳簱'' and isnull(HBookPot,'''')!='''' and (HRealPotType=''渚涘簲鍟�'' or HRealPotType=''瀹㈡埛'') and isnull(HRealPot,'''')!=''''";
                 var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+                
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -658,8 +692,9 @@
             }
             //鍏ュ簱鏌ヨ
             function rk_Display() {
-                var sWhere = " (HRealPotType='渚涘簲鍟�' or HRealPotType='瀹㈡埛') and (HBookPotType='渚涘簲鍟�' or HBookPotType='瀹㈡埛') and HRealPot!=HBookPot";
+                var sWhere = " (HRealPotType=''渚涘簲鍟�'' or HRealPotType=''瀹㈡埛'') and (HBookPotType=''渚涘簲鍟�'' or HBookPotType=''瀹㈡埛'') and HRealPot!=HBookPot";
                 var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+                
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -679,8 +714,9 @@
             }
             //鐩樼泩鏌ヨ
             function py_Display() {
-                var sWhere = "isnull(HBookPot,'')='' and isnull(HRealPot,'')!=''";
+                var sWhere = "isnull(HBookPot,'''')='''' and isnull(HRealPot,'''')!=''''";
                 var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+               
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -700,8 +736,9 @@
             }
             //鐩樹簭鏌ヨ
             function pk_Display() {
-                var sWhere = "isnull(HBookPot,'')!='' and isnull(HRealPot,'')=''";
+                var sWhere = "pk";
                 var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+                
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -721,8 +758,9 @@
             }
             //閫�搴撴煡璇�
             function tk_Display() {
-                var sWhere = " HRealPotType='浠撳簱' and isnull(HRealPot,'')!='' and  (HBookPotType='渚涘簲鍟�' or HBookPotType='瀹㈡埛')";
+                var sWhere = " HRealPotType=''浠撳簱'' and isnull(HRealPot,'''')!='''' and  (HBookPotType=''渚涘簲鍟�'' or HBookPotType=''瀹㈡埛'')";
                 var HItemID = $("#HItemID").val();//鍗曟嵁绫诲瀷
+                
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + 'Gy_StockCheckItemBill/Get_InventoryAnalysisList',
@@ -741,7 +779,6 @@
                 });
             }
             //#endregion
-
 
             //#region 瀹℃牳
             //瀹℃牳 璋冩嫧
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index fcc060d..2e87107 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -126,15 +126,17 @@
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
+                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
-                get_Display(sWhere);
+                get_FastQuery();
             }
             //#endregion
             //#region 鍒濆鍖栬〃鏍兼柟娉�
-            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
-            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+           
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
@@ -316,27 +318,6 @@
                         break;
                 };
             });
-
-            ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            //$.ajax({
-            //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-            //    url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
-            //    type: "GET",
-            //    data: { "sWhere": sWhere},
-            //    success: function (data1) {
-            //        if (data1.count == 1) {
-            //            option.data = data1.data;
-            //            table.render(option);
-            //            layer.close(index);
-            //        } else {
-            //            layer.close(index);
-            //            layer.alert(data1.code + data1.Message, { icon: 5 });
-            //        }
-            //    }, error: function () {
-            //        layer.close(index);
-            //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-            //    }
-            //});
 
             //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html"
new file mode 100644
index 0000000..72b52d1
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillEdit_yqn.html"
@@ -0,0 +1,962 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鑰冨嫟姹囨姤鍗�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style type="text/css">
+        .layui-form-item .layui-inline {
+            margin-right: 0;
+        }
+
+        html {
+            background-color: white;
+            color: white;
+        }
+
+        .layui-table-cell {
+            overflow: visible !important;
+        }
+
+        td .layui-form-select {
+            margin-top: -10px;
+            margin-left: -15px;
+            margin-right: -15px;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <h1 style="text-align: center; padding: 10px 0;"><b>鑰冨嫟姹囨姤鍗�</b></h1>
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
+                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+                                                <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3 layui-inline">
+                                            <label class="layui-form-label">骞冲潎宸ヨ祫</label>
+                                            <div class="layui-input-inline">
+                                                <input class="layui-input" name="HAvgMoney" id="HAvgMoney" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs7 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">瀹℃牳浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾浜�</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div 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="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="layui-row">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label" style="width: 85px;">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+
+                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                            </div>
+                        </script>
+                        <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                </form>
+            </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>
+
+            layui.config({
+                base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+            }).extend({
+                index: 'lib/index' //涓诲叆鍙fā鍧�
+            }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+                var $ = layui.$
+                    , admin = layui.admin
+                    , layer = layui.layer
+                    , table = layui.table
+                    , form = layui.form
+                    , laydate = layui.laydate
+                    , element = layui.element;
+
+                var params = get_UrlVars();
+                if (typeof (params[params[0]]) == "undefined") {
+                    var OperationType = 1;//鎿嶄綔绫诲瀷
+                    var closeType = 2;  //鍏抽棴绫诲瀷
+                } else {
+                    var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                    var linterid = params[params[1]];//婧愬崟id
+                    var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                    var closeType = params[params[3]];  //鍏抽棴绫诲瀷
+                }
+                var hID = params[params[1]];//缂栬緫鏌ョ湅
+
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate',
+                    done: function (value, date, endDate) {//value, date, endDate鐐瑰嚮鏃ユ湡銆佹竻绌恒�佺幇鍦ㄣ�佺‘瀹氬潎浼氳Е鍙戙�傚洖璋冭繑鍥炰笁涓弬鏁帮紝鍒嗗埆浠h〃锛氱敓鎴愮殑鍊笺�佹棩鏈熸椂闂村璞°�佺粨鏉熺殑鏃ユ湡鏃堕棿瀵硅薄
+                        calcAvgMoney(value);
+                    }
+                });
+
+                var tableReload = table.reload;
+                var option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 500
+                    //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                    , page: true //寮�鍚垎椤�
+                    , cols: [[ //琛ㄥご
+                        { type: 'checkbox', fixed: 'left' }
+                        , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                        , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
+                        , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', edit: 'text', event: 'HEmpCheck', width: 150 }
+                        , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
+                        , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', edit: 'text', width: 100 }
+                        , { field: 'HPMTimes', title: '宸ヤ綔宸ユ椂', edit: 'text', width: 100, }
+                        , { field: 'HAMTimes', title: '鏍囧噯宸ユ椂', edit: 'text', width: 100 }
+                        , { field: 'HMoney', title: '宸ヨ祫', width: 100 }
+                        , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                        , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', width: 100, hide: true, hide: true }
+                        , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100, hide: true }
+                        , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100, hide: true }
+                        , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HOutForComTimes', title: '鍏嚭鏃堕棿', edit: 'text', width: 100, hide: true }
+                        , { field: 'HAbsentDays', title: '鏃峰伐澶╂暟', edit: 'text', width: 100, hide: true }
+                        , { field: 'HRestFlag', title: '鍘備紤', edit: 'text', value: "true", width: 100, hide: true }
+                        , { field: 'HSchClassID', title: '鐝', edit: 'text', width: 100, hide: true }
+                        , { field: 'HCTPrjID', title: '鏍哥畻鏂规浠g爜', edit: 'text', width: 100, hide: true }
+                        , { field: 'HCTPrjName', title: '鏍哥畻鏂规鍚嶇О', edit: 'text', event: 'HCTPrjName', width: 100, hide: true }
+                        , { field: 'HWorkTypeID', title: '宸ョ浠g爜', edit: 'text', width: 100, hide: true }
+                        , { field: 'HWorkTypeName', title: '宸ョ鍚嶇О', edit: 'text', event: 'HWorkTypeName', width: 100, hide: true }
+                        , { field: 'HPayMoney', title: '灏忔椂宸ヨ祫', edit: 'text', width: 100, hide: true }
+                        //, { field: 'HNeedTimes	', title: '搴斾笂鐝伐鏃�', edit: 'text', width: 100 }
+                        , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
+                        , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+                        , { field: 'HMainSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
+                        , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                    ]]
+                    , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                };
+                //鍒ゆ柇鏄惁鏂板
+                if (OperationType == 1) {
+                    $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HMaker").val(sessionStorage["HUserName"]);
+                    $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HChecker").val(sessionStorage["HUserName"]);
+                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HUpDater").val(sessionStorage["HUserName"]);
+                    $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    $("#HDeleteMan").val(sessionStorage["HUserName"]);
+                    $("#HCloseMan").val(sessionStorage["HUserName"]);
+                    //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
+                    option.data = [{
+                        "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+                        , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
+                        , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
+                        , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+                        , "HRestFlag": "true", "HSchClassID": 0, "HCTPrjID": 0, "HCTPrjName": "", "HWorkTypeID": 0, "HWorkTypeName": "", "HPayMoney": 0, "HMoney": 0
+                        , "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+                        , "HSourceBillType": "", "HRemark": ""
+                    }];
+                    table.render(option);
+                }
+                else {
+                    $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+                    //缂栬緫鍔犺浇鏁版嵁
+                    $.ajax({
+                        url: GetWEBURL() + 'Pay_WorkTimesBill/Pay_WorkTimesBillListProjectDetai',
+                        type: "GET",
+                        async: false,
+                        data: { "sqlWhere": "and hmainid=" + hID },
+                        success: function (result) {
+
+                            if (result.count == 1) {
+                                option.data = result.data;
+                                table.render(option);
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(index0);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+
+                //澶村伐鍏锋爮浜嬩欢
+                var rowid = 0;
+                var rows = 0;
+                table.on('toolbar(mainTable)', function (obj) {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;;
+                    var AddRow = table.cache['mainTable'];
+                    var NewRow = {
+                        "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+                        , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
+                        , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
+                        , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+                        , "HRestFlag": "true", "HSchClassID": 0, "HCTPrjID": 0, "HCTPrjName": "", "HWorkTypeID": 0, "HWorkTypeName": "", "HPayMoney": 0, "HMoney": 0
+                        , "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+                        , "HSourceBillType": "", "HRemark": ""
+                    };
+                    switch (obj.event) {
+                        case 'btn-AddLine':
+                            //table.cache["mainTable"].push(AddRow[rows]);
+                            table.cache["mainTable"].push(NewRow);
+                            option.data = table.cache["mainTable"];
+                            table.render(option);
+                            rows++;
+                            //layer.msg('澧炲姞涓�琛屾寜閽紒')
+                            break;
+                        case 'btn-CopyLine':
+                            var copydata = JSON.stringify(data);
+                            if (data.length <= 0) {
+                                layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                            }
+                            else if (data.length > 1) {
+                                layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                            }
+                            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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                                //layer.alert(copyrow);
+                            }
+                            break;
+                    }
+                });
+                //琛屽唴浜嬩欢
+                table.on('tool(mainTable)', function (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);
+                            }
+                        });
+                    }
+                    $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                        if (event.key == "F7") {
+                            if (obj.event === 'HEmpCheck') {//鑱屽憳
+                                layer.open({
+                                    type: 2,
+                                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                                    title: '鑱屽憳鍒楄〃',
+                                    closeBtn: 1,
+                                    shift: 2,
+                                    area: ['90%', '90%'],
+                                    maxmin: true,
+                                    content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+                                        }
+                                        obj.update({
+                                            HEmpName: checkStatus.data[0].HName
+                                            , HEmpID: checkStatus.data[0].HItemID
+                                            , HEmpNumber: checkStatus.data[0].HNumber
+                                            , HEmpRate: checkStatus.data[0].HEmpRate
+                                            , HPMTimes: 0
+                                            , HAMTimes: 0
+                                            , HMoney: 0
+                                        });
+                                        layer.close(layer.index);
+                                    }
+                                    , btn2: function (index, layero) {
+                                    },
+                                    end: function () {
+
+                                    }
+                                });
+                            }
+                            if (obj.event === 'HCTPrjName') {//鏍哥畻鏂规
+                                layer.open({
+                                    type: 2//寮圭獥绫诲瀷
+                                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                    , area: ['90%', '90%']//澶у皬
+                                    , title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
+                                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjList.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('璇烽�夋嫨鏁版嵁');
+                                        }
+                                        obj.update({
+                                            HCTPrjName: checkStatus.data[0].HName
+                                            , HCTPrjID: checkStatus.data[0].HItemID
+                                        });
+                                        layer.close(layer.index);
+                                    }
+                                    , btn2: function (index, layero) { }
+                                })
+                            }
+                            if (obj.event === 'HWorkTypeName') {//宸ョ
+                                layer.open({
+                                    type: 2//寮圭獥绫诲瀷
+                                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                                    , area: ['90%', '90%']//澶у皬
+                                    , title: '宸ョ鍒楄〃'//鏍囬
+                                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.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('璇烽�夋嫨鏁版嵁');
+                                        }
+                                        obj.update({
+                                            HWorkTypeName: checkStatus.data[0].HName
+                                            , HWorkTypeID: checkStatus.data[0].HItemID
+                                        });
+                                        layer.close(layer.index);
+                                    }
+                                    , btn2: function (index, layero) { }
+                                })
+                            }
+                            obj.event = "";
+                            return false;
+
+                        }
+                    })
+                });
+
+                //鐩戝惉鍗曞厓鏍肩紪杈�
+                table.on('edit(mainTable)', function (obj) {
+                    // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+                    var oldText = $(this).prev().text();
+                    var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                        , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                        , field = obj.field; //寰楀埌瀛楁
+                    //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+                    switch (field) {
+                        case "HEmpRate":  //鑱屽憳绯绘暟
+                            value = isNaN(value) ? 0 : value;
+                            var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+                            var HEmpRate = value;
+                            var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //宸ヤ綔宸ユ椂
+                            var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //鏍囧噯宸ユ椂
+                           
+                            var HMoney;
+                            if (HAMTimes == 0)
+                                HMoney = 0;
+                            else
+                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HEmpRate: value,                  //涓嬪崍宸ユ椂
+                                HMoney: HMoney, //
+                            });
+                            break;
+                        case "HPMTimes":  //宸ヤ綔宸ユ椂
+                            value = isNaN(value) ? 0 : value;
+                            var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+                            var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
+                            var HAMTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes); //鏍囧噯宸ユ椂
+                            var HPMTimes = value;//骞冲潎宸ヨ祫
+                            //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
+                            var HBaseTimes = Number(isNaN(data.HAMTimes) ? 0 : data.HAMTimes) + Number(value);
+                            //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+                            var HMoney;
+                            if (HAMTimes == 0)
+                                HMoney = 0;
+                            else
+                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HPMTimes: value,                  //涓嬪崍宸ユ椂
+                                HBaseTimes: HBaseTimes,           //鍩烘湰宸ユ椂
+                                HMoney: HMoney, //
+                            });
+                            break;
+                        case "HAMTimes":  //鏍囧噯宸ユ椂
+                            value = isNaN(value) ? 0 : value;
+                            var HAvgMoney = $("#HAvgMoney").val();//骞冲潎宸ヨ祫
+                            var HEmpRate = Number(isNaN(data.HEmpRate) ? 0 : data.HEmpRate);
+                            var HPMTimes = Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes); //宸ヤ綔宸ユ椂
+                            var HAMTimes = value; //宸ヤ綔宸ユ椂
+                            //鍩烘湰宸ユ椂=涓婂崍宸ユ椂+涓嬪崍宸ユ椂
+                            var HBaseTimes = Number(value) + Number(isNaN(data.HPMTimes) ? 0 : data.HPMTimes);
+                            //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+                            var HMoney;
+                            if (value == 0)
+                                HMoney = 0;
+                            else
+                                HMoney = HAvgMoney * HEmpRate * HPMTimes / HAMTimes
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HAMTimes: value,                  //涓婂崍宸ユ椂
+                                HBaseTimes: HBaseTimes,           //鍩烘湰宸ユ椂
+                                HMoney: HMoney, //宸ヨ祫
+                            });
+                            break;
+                        case "HPayMoney":        //灏忔椂宸ヨ祫
+                            value = isNaN(value) ? 0 : value;
+                            //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+                            var HMoney = Number(value) * Number(isNaN(data.HBaseTimes) ? 0 : data.HBaseTimes);
+                            //console.log(HMoney);
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMoney: HMoney, //宸ヨ祫
+                            });
+                            break;
+                        case "HMoney":         //宸ヨ祫
+                            value = isNaN(value) ? 0 : value;
+                            if (data.HPayMoney == 0 || data.HPayMoney == null) {
+                                value = 0;
+                            }
+                            //宸ヨ祫=灏忔椂宸ヨ祫*鍩烘湰宸ユ椂
+                            var HMoney = Number(isNaN(data.HPayMoney) ? 0 : data.HPayMoney) * Number(isNaN(data.HBaseTimes) ? 0 : data.HBaseTimes);
+                            console.log(HMoney);
+                            //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                            obj.update({
+                                HMoney: HMoney, //宸ヨ祫
+                            });
+                            break;
+                            break;
+                        default:
+                    }
+                });
+                function RoadBillMain(hID)//鍔犺浇琛ㄥご
+                {
+                    //alert(hID);
+                    //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                    $.ajax({
+                        url: GetWEBURL() + "Pay_WorkTimesBill/Pay_WorkTimesBillListCheckDetail",
+                        type: "GET",
+                        data: {
+                            "HID": hID
+                        },
+                        success: function (result) {
+
+                            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                var data = result.data.h_v_Pay_WorkTimesBillList[0];
+                                console.info(data);
+                                form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                    "HBillNo": data.鍗曟嵁鍙�
+                                    , "HDate": formatDate(data.鏃ユ湡)
+                                    //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                    , "HGroupID": data.HGroupID                    //鐝粍ID
+                                    , "HGroupName": data.鐝粍                 //鐝粍鍚嶇О
+                                    , "HEmpName": data.鑱屽憳         //涓荤鍚嶇О
+                                    , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                                    , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
+                                    , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                                    , "HExplanation": data.鎽樿              //鎽樿
+                                    , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                                    , "HMaker": data.鍒跺崟浜�
+                                    , "HChecker": data.瀹℃牳浜�
+                                    , "HCloseMan": data.鍏抽棴浜�
+                                    , "HMakeDate": data.鍒跺崟鏃ユ湡
+                                    , "HCheckDate": data.瀹℃牳鏃ユ湡
+                                    , "HCloseDate": data.鍏抽棴鏃ユ湡
+                                    , "HUpDateDate": data.淇敼鏃ユ湡
+                                    , "HDeleteDate": data.浣滃簾鏃ユ湡
+                                    , "HAvgMoney": data.HAvgMoney
+                                });
+
+                            } else {
+                                layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                            }
+                        }, error: function () {
+                            layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                        }
+                    });
+                }
+                var date = new Date();
+                var day = date.getDate();
+                var month = date.getMonth() + 1;
+                var year = date.getFullYear();
+                var shijian = year + "-" + month + "-" + day;
+
+                //鍒ゆ柇鏄惁鏂板
+                if (hID == null || hID == 0) {
+                    //鑾峰彇鏈�澶у崟鎹彿 new
+                    $("#HInterID").val("0");
+                    $("#HBillNo").val("");
+                    $.ajax({
+                        url: GetWEBURL() + "/Web/GetMAXNum",
+                        type: "GET",
+                        async: false,
+                        data: { "HBillType": '2203' },
+                        success: function (d) {
+                            //console.log(d.data);
+                            $("#HBillNo").val(d.data[0].HBillNo);
+                            $("#HDate").val(shijian);
+                            $("#HInterID").val("0");
+                            calcAvgMoney(shijian);
+                        }
+                    });
+                }
+                else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                    RoadBillMain(hID);
+                    /* RoadBillSub(linterid);*/
+                }
+                //琛ㄥご淇℃伅鐝粍寮圭獥
+                form.on('submit(HGroupList)', function () {
+                    //椤甸潰灞�-鑷畾涔�
+                    layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '鐝粍鍒楄〃',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
+                        btn: ['纭畾', '鍙栨秷']
+                        , btn1: function (index, layero) {
+
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                            if (checkStatus.data.length === 0) {
+                                return layer.msg('璇烽�夋嫨鏁版嵁');
+                            }
+                            $("#HGroupName").val(checkStatus.data[0].鐝粍);
+                            $("#HGroupID").val(checkStatus.data[0].HItemID);
+                            GetEmployee();
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+                });
+                function GetEmployee() {
+                    $.ajax({
+                        url: GetWEBURL() + "/Pay_WorkTimesBill/GetEmployeeByHGroup",
+                        type: "GET",
+                        data: { "HGroupID": $("#HGroupID").val() },
+                        success: function (result) {
+                            if (result != null) {
+                                if (result.count == 1) {
+                                    var BYData = result.list[0];
+                                    var rowdate1 = layui.table.cache["mainTable"];
+                                    option.data = [{
+                                        "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+                                        , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes": 0, "HBaseDays": 0, "HOverTimes": 0
+                                        , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes": 0, "HEarlyQty": 0
+                                        , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+                                        , "HRestFlag": "true", "HSchClassID": 0, "HCTPrjID": 0, "HCTPrjName": "", "HWorkTypeID": 0, "HWorkTypeName": "", "HPayMoney": 0, "HMoney": 0
+                                        , "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+                                        , "HSourceBillType": "", "HRemark": ""
+                                    }];
+                                    table.render(option);
+                                    if (BYData.length != 0)  //琛ㄤ綋鏁版嵁涓虹┖鏃�
+                                    {
+                                        buttonArr = [];//娓呯┖鏁扮粍
+                                        for (var i = 0; i < BYData.length; i++) {
+                                            var checkrow = {
+                                                "HEmpID": BYData[i].HEmpID, "HEmpNumber": BYData[i].HEmpNumber, "HEmpName": BYData[i].HEmpName, "HEmpRate": BYData[i].HEmpRate
+                                                , "HPMTimes": rowdate1[i].HPMTimes, "HAMTimes": rowdate1[i].HAMTimes, "HBaseTimes": rowdate1[i].HBaseTimes, "HBaseDays": rowdate1[i].HBaseDays, "HOverTimes": rowdate1[i].HOverTimes
+                                                , "HOverDays": rowdate1[i].HOverDays, "HLeaveTimes": rowdate1[i].HLeaveTimes, "HLeaveDays": rowdate1[i].HLeaveDays, "HLateQty": rowdate1[i].HLateQty, "HLateTimes": rowdate1[i].HLateTimes, "HEarlyQty": rowdate1[i].HEarlyQty
+                                                , "HEarlyTimes": rowdate1[i].HEarlyTimes, "HOutForEmpQty": rowdate1[i].HOutForEmpQty, "HOutForEmpTimes": rowdate1[i].HOutForEmpTimes, "HOutForComQty": rowdate1[i].HOutForComQty, "HOutForComTimes": rowdate1[i].HOutForComTimes, "HAbsentDays": rowdate1[i].HAbsentDays
+                                                , "HRestFlag": "true", "HSchClassID": rowdate1[i].HSchClassID, "HCTPrjID": BYData[i].HCTPrjID, "HCTPrjName": BYData[i].HCTPrjName, "HWorkTypeID": rowdate1[i].HWorkTypeID, "HWorkTypeName": rowdate1[i].HWorkTypeName, "HPayMoney": rowdate1[i].HPayMoney, "HMoney": rowdate1[i].HMoney
+                                                , "HNeedTimes": rowdate1[i].HNeedTimes, "HMainSourceInterID": rowdate1[i].HMainSourceInterID, "HMainSourceEntryID": rowdate1[i].HMainSourceEntryID, "HMainSourceBillNo": rowdate1[i].HMainSourceBillNo
+                                                , "HSourceBillType": rowdate1[i].HSourceBillType, "HRemark": rowdate1[i].HRemark
+                                            };
+                                            buttonArr.push(checkrow);  //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+                                        }
+                                        table.reload("mainTable", {
+                                            data: buttonArr    //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+                                        })
+                                    }
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }
+                        }
+                    })
+                }
+                //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+                form.on('submit(Department)', function () {
+                    //椤甸潰灞�-鑷畾涔�
+                    layer.open({
+                        type: 2,
+                        skin: 'layui-layer-rim', //鍔犱笂杈规
+                        title: '閮ㄩ棬鍒楄〃',
+                        closeBtn: 1,
+                        shift: 2,
+                        area: ['80%', '80%'],
+                        maxmin: true,
+                        content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
+                        btn: ['纭畾', '鍙栨秷']
+                        , btn1: function (index, layero) {
+
+                            //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                            var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                            if (checkStatus.data.length === 0) {
+                                return layer.msg('璇烽�夋嫨鏁版嵁');
+                            }
+                            $("#HDeptName").val(checkStatus.data[0].HName);
+                            $("#HDeptID").val(checkStatus.data[0].HItemID);
+                            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        }
+                        , btn2: function (index, layero) {
+                            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                        },
+                        end: function () {
+
+                        },
+                        success: function (layero, index) {
+
+                        }
+                    });
+                });
+                //閫�鍑�
+                form.on('submit(Exit)', function (data) {
+                    if (OperationType == 1) {
+                        Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+                    }
+                    else if (OperationType == 3) {
+                        Pub_Close(closeType);
+                    }
+                    else {
+                        Pub_Close(2);
+                    }
+                });
+                function formatDate(date) {
+                    var d = new Date(date),
+                        month = '' + (d.getMonth() + 1),
+                        day = '' + d.getDate(),
+                        year = d.getFullYear();
+
+                    if (month.length < 2) month = '0' + month;
+                    if (day.length < 2) day = '0' + day;
+
+                    return [year, month, day].join('-');
+                }
+                //淇濆瓨鎻愪氦
+                form.on('submit(Saver)', function (data) {//鎻愪氦
+                    var refSav = "";
+                    if (linterid == "" || linterid == null) {
+                        refSav = "Add";
+                    }
+                    if (linterid != "" && linterid != null) {
+                        refSav = "Update";
+                    }
+                    data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+                    var sMainStr = JSON.stringify(data.field);
+                    var sSubStr = JSON.stringify(table.cache['mainTable']);
+                    var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+                    if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                    {
+                        return false;
+                    }
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Pay_WorkTimesBill/SaveGetWorkTimesBillList",
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                });
+                            }
+                            else {
+                                f_alert(data.Message);
+                            }
+                        },
+                        error: function (err) {
+                            f_alert("閿欒:" + err);
+                        }
+                    });
+                });
+                function f_alert(sMsg) {
+                    layer.alert(sMsg, { icon: 5 });
+
+                }
+                //鐩戝惉鎻愪氦
+                form.verify({
+                    numberOrEmpty: function (value, item) {
+                        // if (value != '') {
+                        if (!/^\d+$/.test(value)) {
+                            return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                        }
+                        //}
+                    }
+                });
+                function calcAvgMoney(HDate) {
+                    $.ajax({
+                        type: "POST",
+                        url: GetWEBURL() + "/Pay_WorkTimesBill/calcAvgMoney",
+                        async: true,
+                        data: { "msg": HDate },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                $("#HAvgMoney").val(data.data[0].Column1);
+                            }
+                            else {
+                                f_alert(data.Message);
+                            }
+                        },
+                        error: function (err) {
+                            f_alert("閿欒:" + err);
+                        }
+                    });
+                }
+            });
+            //瀹氫箟鍏ㄥ眬鍙橀噺
+            var HReasonName, ReasonID, EmpName, SQProcName,
+                ProcID, ZRProcName, QRName
+                ;
+            function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
+            {
+                HReasonName = obj[0].HName;
+                ReasonID = obj[0].HItemID;
+            }
+            //杩斿洖鐗╂枡
+            function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
+                $("#HMater").val(obj[0].HName);
+                $("#HMaterID").val(obj[0].HItemID);
+                $("#HMaterNumber").val(obj[0].HNumber);
+            }
+            //杩斿洖宸ュ簭
+            function GetHProcValue(obj) {  //杩斿洖宸ュ簭
+                $("#HProcName").val(obj[0].宸ュ簭);
+                $("#HProcID").val(obj[0].HItemID);
+                $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
+            }
+            function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
+                $("#HDepName").val(obj[0].HName);
+                $("#HDeptID").val(obj[0].HItemID);
+                $("#HDeptNumber").val(obj[0].HNumber);
+            }
+            //杩斿洖鍗曚綅
+            function GetHUnitNameValue(obj) {
+                $("#HUName").val(obj[0].HName);
+                $("#HUnitID").val(obj[0].HItemID);
+                $("#HUnitNumber").val(obj[0].HNumber);
+            }
+            function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
+                EmpName = obj[0].HName;
+                // $("#HEmpName").val(obj[0].HName);
+                //$("#HItemID").val(obj[0].HItemID);
+            }
+            //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
+            //    SQProcName = obj[0].宸ュ簭;
+            //    ProcID = obj[0].HItemID;
+            //    //$("#HSQProcName").val(obj[0].宸ュ簭);
+            //    //$("#HProcID").val(obj[0].HItemID);
+            //}
+            function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
+                ZRProcName = obj[0].宸ュ簭;
+                //$("#HZRProcName").val(obj[0].宸ュ簭);
+                //$("#HItemID").val(obj[0].HItemID);
+            }
+            //HWorker
+            function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+                QRName = obj[0].HName;
+                //$("#HQRName").val(obj[0].HName);
+                //$("#HItemID").val(obj[0].HItemID);
+            }
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                var Result = true;
+                if ($("#HGroupID").val() == '') {
+                    layer.msg("鐝粍娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDeptID").val() == '') {
+                    layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) == "undefined") {
+                    layer.msg("娌℃湁鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+                        if (sSubStr[i].HEmpID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鑱屽憳淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                    }
+                }
+                else {
+                    return Result;
+                }
+                return Result;
+
+            }
+
+
+        </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html"
new file mode 100644
index 0000000..ee73e76
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList_yqn.html"
@@ -0,0 +1,349 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鑰冨嫟姹囨姤鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <!--<div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>-->
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                <!--<div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+
+                                </div>-->
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script> 
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+          
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+                        , { field: 'HAvgMoney', title: '骞冲潎宸ヨ祫', width: 120 }
+                        //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+                        //, { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
+                        //, { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 125 }
+                        //, { field: '鐝粍', title: '鐝粍', width: 125 }
+                        //, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        //, { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 180 }
+                        //, { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        //, { field: '鎽樿', title: '鎽樿', width: 125 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: 'HEmpNumber', title: '鑱屽憳浠g爜', width: 180 }
+                        , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+                        , { field: '鑱屽憳绯绘暟', title: '鑱屽憳绯绘暟',  width: 100 }
+                        , { field: '涓嬪崍', title: '宸ヤ綔宸ユ椂',  width: 100 }
+                        , { field: '涓婂崍', title: '鏍囧噯宸ユ椂',  width: 100 }
+                        , { field: 'HMoney', title: '宸ヨ祫', width: 100 }
+                        //, { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
+                    ]]
+                };
+            }
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Pay_WorkTimesBill/GetWorkTimesBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    case 'btn-Add':
+                        //椤甸潰灞�-鑷畾涔�
+                        layer.open({
+                            type: 2,
+                            skin: 'layui-layer-rim', //鍔犱笂杈规
+                            title: '鏂板鑰冨嫟姹囨姤鍗�',
+                            closeBtn: 1,
+                            shift: 2,
+                            area: ['100%', '100%'],
+                            maxmin: true,
+                            content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html?OperationType=1&linterid=&HSouceBillType=0&closeType=1',
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            },
+                            success: function (layero, index) {
+
+                            }
+                        });
+                        break;
+                    case 'btn-Edit':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var hID = data[0].hmainid.toString();
+                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                            layer.open({
+                                type: 2
+                                , area: ['100%', '100%']
+                                , title: '缂栬緫鑰冨嫟姹囨姤鍗�'
+                                , closeBtn: 1
+                                , shade: 0.6 //閬僵閫忔槑搴�
+                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                                , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillEdit_yqn.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+                                , resize: false,
+                                end: function () {
+                                    //鍒锋柊椤甸潰,
+                                    location.reload();
+                                }
+                                , cancel: function () {
+                                    //$(".layui-btn").removeClass("layui-btn-disabled");
+                                }
+                            })
+
+                        } else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                        }
+
+                        break;
+                    case 'btn-Delete':
+                        var checkStatus = table.checkStatus('mainTable')
+                            , data = checkStatus.data;
+                        if (checkStatus.data.length === 1) {
+                            var InterID = data[0].hmainid.toString();
+                            //閫昏緫鍒犻櫎鏂规硶
+                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                                $.ajax({
+                                    type: "GET",
+                                    url: GetWEBURL() + "Pay_WorkTimesBill/DeltetWorkTimesBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                                    data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                            });
+
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }, error: function () {
+                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                    }
+                                });
+                            })
+                        }
+                        else {
+                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                        }
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                sWhere = "";
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+          
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index bad2269..c061171 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -1096,7 +1096,7 @@
                                         HWHID: checkStatus.data[0].HItemID,
                                         HWHCode: checkStatus.data[0].HNumber,
                                         HWHName: checkStatus.data[0].HName,
-                                        HSPID: "",
+                                        HSPID: "0",
                                         HSPCode: "",
                                         HSPName: "",
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index f78867f..49e18f0 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -29,6 +29,9 @@
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
                         <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">鎷f枡閰嶉��</button>
+                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
                     </div>
                     <div class="layui-collapse">
                         <div class="layui-colla-item">
@@ -59,7 +62,7 @@
                                     <input type="text" class="layui-input" name="MaterialModel" id="MaterialModel" onmouseover="this.title=this.value" readonly>
                                 </div>
                             </div>
-                            <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+                            <div class="layui-colla-content" style="padding: 0px; margin-left: 5%;">
                                 <div class="layui-row" style="margin-top:10px;">
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ユ</label>
@@ -92,20 +95,20 @@
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">鎷f枡鏃ユ湡</label>
                                         <div class="layui-input-block" style="margin-left: 120px;">
-                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
+                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">鈥�</label>
                                         <div class="layui-input-block" style="margin-left: 118px;">
-                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
+                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+                                        <label class="layui-form-label" style="width: 85px;">閮ㄩ棬</label>
                                         <div class="layui-input-block" style="margin-left: 77px;">
                                             <input type="text" class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;float: right;margin-right: 3px;">
+                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptName" id="btnHDeptName" style="padding: 0 10px;margin-right: 3px;">
                                                 <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                             </button>
                                         </div>
@@ -123,11 +126,6 @@
                                         </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="layui-row" style="text-align: center; margin-bottom: 20px; margin-top: 20px;">
-                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Cx" id="Cx">鏌ヨ</button>
-                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Jlps" id="Jlps">鎷f枡閰嶉��</button>
-                                <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
                             </div>
                             <table class="" id="mainTable" lay-filter="mainTable"></table>
                         </div>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index 9deb464..1bcdfd1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -129,17 +129,15 @@
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
                                         <div class="layui-input-block" style="margin-left: 120px;">
-                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 48px;">
+                                            <input type="date" class="layui-input" lay-verify="HBeginDate" name="HBeginDate" id="HBeginDate" style="padding-left: 80px;">
                                         </div>
                                     </div>
                                     <div class="layui-inline">
                                         <label class="layui-form-label" style="width: 85px;text-align:center;">鈥�</label>
-                                        <div class="layui-input-block" style="margin-left: 118px;">
-                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 48px;">
+                                        <div class="layui-input-block" style="margin-left: 120px;">
+                                            <input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
                                         </div>
                                     </div>
-                                </div>
-                                <div class="layui-row" style="margin-top:10px;">
                                     <div class="layui-inline">
                                         <div class="layui-input-block" style="margin-left: 90px;">
                                             <input type="checkbox" name="ps" id="ps" lay-skin="primary" lay-filter="ps" title="浠呮樉绀烘湭瀹屽叏閰嶉��">
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 22fd485..0ac634c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -21,6 +21,9 @@
                         <div style="padding: 10px; ">
                             <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="ExcelImport" id="ExcelImport">Excel瀵煎叆</button>
                             <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="btnLock" id="btnLock">閿佸畾</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">瑙i攣</button>
+                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">榻愬鍒嗘瀽</button>
                         </div>
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
@@ -108,7 +111,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">閿佸畾澶╂暟</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                                <input type="text" class="layui-input" name="HLockedDay" id="HLockedDay" value="3">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -263,10 +266,26 @@
             set_ClearQuery();
         });
 
+        //榻愬鍒嗘瀽
+        form.on('submit(btnCompleteSetAnalysis)', function (data) {
+            get_btnCompleteSetAnalysis();
+        })
+
         //琛屽唴浜嬩欢
         table.on('tool(mainTable)', function (obj) {
             set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
         });
+
+        //閿佸畾
+        form.on('submit(btnLock)', function (data) {
+            get_btnLock();
+        })
+
+        //瑙i攣
+        form.on('submit(btnUnlock)', function (data) {
+            get_btnUnlock();
+        })
+
         //#endregion
 
         //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -310,10 +329,7 @@
         function set_InitGrid() {
             var columns = [];
             var myDate = new Date();
-            var yyyy = myDate.getFullYear();
-            var MM = myDate.getMonth() + 1;
-            var dd = myDate.getDate();
-            var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
+            var oneday = 1000 * 60 * 60 * 24;
 
             columns.push({ type: 'checkbox', fixed: 'left' });
             columns.push({ field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true });
@@ -335,19 +351,139 @@
             columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width:150 });
             columns.push({ field: '鏈叆搴撴暟閲�', title: '鏈叆搴撴暟閲�', width: 150 });//0
             columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150 });//0
-            columns.push({ field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150 });//0
+            columns.push({field: '鏃ヨ鍒掓暟閲忔�婚噺', title: '鏃ヨ鍒掓暟閲忔�婚噺', width: 150});//0
             columns.push({ field: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', title: '浠婃棩涔嬪墠鏃ヨ鍒掓暟閲�', width: 150 });//0
-            columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width:150 });
+            columns.push({ field: '璁″垝寮�濮嬫棩鏈�', title: '棰勮寮�宸ユ棩鏈�', width: 150, templet: "<div>{{d.璁″垝寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.璁″垝寮�濮嬫棩鏈�, 'yyyy-MM-dd')}}</div>"});
             columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
             columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150});
             columns.push({ field: 'HSourceID', title: 'HSourceID', hide:true });
-            columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID"  });
-            for (var i = 0; i <= (SumMonth - dd); i++) {
-                columns.push({ field: Format(yyyy + '/' + MM + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (dd + i), 'MM.dd'), edit: 'text', width: 70 })//0
-            }
-            for (var i = 1; i < dd; i++) {
-                columns.push({ field: Format(yyyy + '/' + (MM + 1) + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM + 1) + '/' + i, 'MM.dd'), edit: 'text', width: 70 })//0
-            }
+            columns.push({ field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 150, edit: 'text', event: "HSourceID" });
+
+            columns.push({
+                field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 0 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 1 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 1 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 1 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 2 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 2 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 2 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 3 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 3 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 3 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 4 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 4 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 4 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 5 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 5 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 5 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 6 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 6 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 6 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 7 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 7 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 7 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 8 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 8 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 8 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 9 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 9 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 9 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 10 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 10 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 10 * oneday, 'yyyy-MM-dd')]);
+                }  })//0
+            columns.push({
+                field: Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 11 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 11 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 11 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 12 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 12 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 12 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 13 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 13 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 13 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 14 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 14 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 14 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 15 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 15 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 15 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 16 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 16 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 16 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 17 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 17 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 17 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 18 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 18 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 18 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 19 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 19 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 19 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 20 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 20 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 20 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 21 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 21 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 21 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 22 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 22 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 22 * oneday, 'yyyy-MM-dd')]);
+                }  })//0
+            columns.push({
+                field: Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 23 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 23 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 23 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 24 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 24 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 24 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 25 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 25 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 25 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 26 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 26 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 26 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 27 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 27 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 27 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 28 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 28 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 28 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 29 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 29 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 29 * oneday, 'yyyy-MM-dd')]);
+                } })//0
+            columns.push({
+                field: Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 30 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
+                    return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')]);
+                }  })//0
+
             columns.push({ field: 'T31', title: 'T31', width: 70 });//0
             columns.push({ field: '璁㈠崟绫诲瀷', title: '璁㈠崟绫诲瀷', width: 150 });
             columns.push({ field: '鐢熶骇璁㈠崟鍗曟嵁绫诲瀷', title: '婧愬崟璁㈠崟鍗曟嵁绫诲瀷', width: 150 });
@@ -355,7 +491,7 @@
             columns.push({ field: '浜х嚎鍏ュ簱鏁伴噺', title: '浜х嚎鍏ュ簱鏁伴噺', width: 150 });
             columns.push({ field: '鏈帓鏁伴噺', title: '鍙帓鏁伴噺', width: 150 });
             columns.push({ field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇', width: 150 });
-            columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150 });
+            columns.push({ field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 150, templet: "<div>{{d.浜よ揣鏃ユ湡 =='' ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"});
             columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
             columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
             columns.push({ field: 'hmainid', title: '鏃ヨ鍒掑伐鍗曚富鐮�', width: 150 });
@@ -364,12 +500,12 @@
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
                 , height: 'full-120'
-                , page: true
+                , page: false
                 , cellMinWidth: 90
-                , limit: 50
-                , limits: [50, 500, 5000, 20000]
                 , cols: [columns]
+                , limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
             };
+
         }
 
         //鏌ヨ鍔犺浇鏁版嵁
@@ -383,6 +519,47 @@
                     if (data1.count == 1) {
                         option.data = data1.data;
                         table.render(option);
+                        var HinterID_S = [];
+                        for (var i = 0; i < data1.data.length; i++) {
+                            HinterID_S.push(data1.data[i]["hmainid"]);
+                        }
+                        layer.close(ajaxLoad);
+                        if (HinterID_S.length > 0) {
+                            get_Display_1(HinterID_S);
+                            get_Display_2(HinterID_S)
+                        }
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鏌ヨ 琛ㄦ牸鏁版嵁 閿佸畾鐘舵��
+        function get_Display_1(HinterID_S) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
+                type: "GET",
+                data: { "sWhere": HinterID_S.toString(),"num":1 },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        if (data1.data[0]["DayNum"] > 0) {
+                            for (var i = 0; i <= data1.data[0]["DayNum"]; i++) {
+                                option.cols[0][27 + i]["edit"] = "";
+                                option.cols[0][27 + i]["style"] = "	background-color: #e6e6e6";
+                            }
+                        } else {
+                            for (var i = 0; i < 31; i++) {
+                                option.cols[0][27 + i]["edit"] = "text";
+                                option.cols[0][27 + i]["style"] = "";
+                            }
+                        }
+                        table.render(option);
                         layer.close(ajaxLoad);
                         //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                     } else {
@@ -394,6 +571,81 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+        }
+
+        //鏌ヨ 琛ㄦ牸鏁版嵁 榻愬鐘舵��
+        function get_Display_2(HinterID_S) {
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
+                type: "GET",
+                data: { "sWhere": HinterID_S.toString(), "num": 2 },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        if (data1.data.length > 0) {
+                            //鑾峰彇姣忎釜鍗曟嵁闇�瑕佹爣璁扮殑 鏁版嵁
+                            var numData = [];
+                            var _numData = data1.data;
+                            for (var i = 0; i < option.data.length; i++) {
+                                numData = _numData;
+                                _numData = [];
+                                for (var j = 0; j < numData.length; j++) {
+                                    if (option.data[i]["HInterID"] == numData[j]["HInterID"]) {
+                                        option.data[i][Format(numData[j]["HMasterDate"], 'yyyy/MM/dd')] = numData[j]["HComplete"];
+                                    } else {
+                                        _numData.push(numData[j]);
+                                    }
+                                }
+                            }
+
+                            //鍘婚噸鑾峰彇闇�瑕佹爣璁扮姸鎬佺殑鏃ユ湡
+                            var _numData2 = [];
+                            for (var i = 0; i < data1.data.length; i++) {
+                                if ($.inArray(data1.data[i]["HMasterDate"], _numData2) == -1) {
+                                    _numData2.push(data1.data[i]["HMasterDate"]);
+                                }
+                            }
+
+                            //鑾峰彇鏃ユ湡涓嬫爣
+                            var _numData3 = [];
+                            for (var i = 0; i < _numData2.length; i++) {
+                                for (var j = 27; j < 58; j++) {
+                                    if (option.cols[0][j]["field"] == _numData2[i]) {
+                                        _numData3[i] = j;
+                                        break;
+                                    }
+                                }
+                            }
+                            table.render(option);
+                        }
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+        }
+
+        //鏁伴噺鏍囪棰滆壊
+        function DayColor(DaySate, DayHQty) {
+            if (DaySate == "榻愬" || DaySate == "鏈綈濂�") {
+                if (DaySate == "榻愬") {
+                    return "<span style='color:green;'>" + DayHQty + "</span>";
+                }
+                else {
+                    return "<span style='color:red;'>" + DayHQty + "</span>";
+                }
+            } else {
+                if (DayHQty == null) {
+                    return "<span></span>";
+                } else {
+                    return "<span>" + DayHQty + "</span>";
+                }
+            }
         }
 
         //Excel瀵煎叆
@@ -486,7 +738,7 @@
             var HSeOrderBillNo = $("#HSeOrderBillNo").val();//閿�鍞鍗曞彿
             var HMaterID = $("#HMaterID").val();//鐗╂枡缂栫爜id
             var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
-          
+
             sWhere = {
                 HPlanBeginDate: HPlanBeginDate
                 , HProdORGID: HProdORGID
@@ -515,6 +767,37 @@
             $("#HProdORGID").val(sessionStorage["OrganizationID"])//鐢熶骇璁㈠崟缁勭粐
             form.render('select');
             sWhere = "";
+        }
+
+        //榻愬鍒嗘瀽
+        function get_btnCompleteSetAnalysis() {
+            if ($("#HWorkShopID").val() == 0) {
+                return layer.msg("鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+            }
+            sWhere = {
+                HProdORGID: $("#HProdORGID").val()
+                , HWorkShopID: $("#HWorkShopID").val()
+            }
+            sWhere = JSON.stringify(sWhere);
+            var ajaxLoad = layer.load();
+            $.ajax({
+                url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_CompleteSetAnalysis',
+                type: "GET",
+                data: { "sWhere": sWhere, "user": sessionStorage["Czybm"] },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        get_FastQuery(2);
+                        layer.msg(data1.Message);
+                        layer.close(ajaxLoad);
+                    } else {
+                        layer.close(ajaxLoad);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(ajaxLoad);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
         }
 
         //淇濆瓨
@@ -603,6 +886,74 @@
             })
         }
 
+        //閿佸畾
+        function get_btnLock() {
+            var data = table.cache["mainTable"];
+
+            if (data.length == 0) {
+                return layer.msg("璇烽�夋嫨鏁版嵁杩涜閿佸畾!")
+            } else {
+
+                var hmainid_s = [];
+                for (var i = 0; i < data.length; i++) {
+                    hmainid_s.push(data[i]["hmainid"]);
+                }
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedDay',
+                    type: "GET",
+                    data: { "sWhere": hmainid_s.toString(), "HLockedDay": $("#HLockedDay").val() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸查攣瀹�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+        }
+
+        //瑙i攣
+        function get_btnUnlock() {
+            var data = table.cache["mainTable"];
+
+            if (data.length == 0) {
+                return layer.msg("璇烽�夋嫨鏁版嵁杩涜瑙i攣!")
+            } else {
+                var hmainid_s = [];
+                for (var i = 0; i < data.length; i++) {
+                    hmainid_s.push(data[i]["hmainid"]);
+                }
+
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockDay',
+                    type: "GET",
+                    data: { "sWhere": hmainid_s.toString(), "HLockedDay": $("#HLockedDay").val() },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            layer.msg("宸茶В閿�");
+                            get_FastQuery(2);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+        }
+
         //#endregion
         //浠ヤ笂鏄痩ayui妯″潡
     });
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
new file mode 100644
index 0000000..0c17851
--- /dev/null
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
@@ -0,0 +1,327 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閿�鍞鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
+                                    </div>
+                                </div>
+
+                                <div class="layui-colla-content">
+                                    <div class="layui-inline">
+                                        <div class="layui-inline">
+                                            <span>鍏朵粬鏉′欢></span>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">瀹㈡埛</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HCusID" id="HCusID" 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" name="HDeptID" id="HDeptID" 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" name="HMangerID" id="HMangerID" style="width:190px;">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
+    <script>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                //娓呯┖杩囨护鏉′欢
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //#endregion
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+            $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , limit: 50
+                    , limits: [50, 500, 5000, 20000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125}
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125 }
+                        , { field: 'HBillType', title: 'HBillType', hide: true }
+                        , { field: 'HCusID', title: 'HCusID', hide: true }
+                        , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜', width: 125 }
+                        , { field: '瀹㈡埛', title: '瀹㈡埛' }
+                        , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125 }
+                        , { field: 'HSSID', title: 'HSSID', hide: true }
+                        , { field: '缁撶畻鏂瑰紡浠g爜', title: '缁撶畻鏂瑰紡浠g爜', width: 125 }
+                        , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125}
+                        , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170}
+                        , { field: 'HCurID', title: 'HCurID', hide: true }
+                        , { field: '甯佸埆浠g爜', title: '甯佸埆浠g爜' }
+                        , { field: '甯佸埆', title: '甯佸埆' }
+                        , { field: '姹囩巼', title: '姹囩巼' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 125 }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+                        , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�' }
+                        , { field: 'HManagerID', title: 'HManagerID', hide: true }
+                        , { field: '涓荤浠g爜', title: '涓荤浠g爜' }
+                        , { field: '涓荤', title: '涓荤' }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�' }
+                        , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
+                        , { field: '鎽樿', title: '鎽樿' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: '鏁伴噺', title: '鏁伴噺' }
+                        , { field: '鍗曚环', title: '鍗曚环' }
+                        , { field: '閲戦', title: '閲戦' }
+                        , { field: '绋庣巼', title: '绋庣巼' }
+                        , { field: '绋庨', title: '绋庨' }
+                        , { field: '浠风◣鍚堣', title: '浠风◣鍚堣' }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                        , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+
+                    ]]
+                };
+            }
+
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Xs_SeOrderBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCusID = $("#HCusID").val();
+                var HDeptID = $("#HDeptID").val();
+                var HMangerID = $("#HMangerID").val();
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HCusID) {
+                    sWhere += " and 瀹㈡埛 like '%" + HCusID + "%'";
+                }
+                if (HDeptID) {
+                    sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+                }
+                if (HMangerID) {
+                    sWhere += " and 涓荤 like '%" + HMangerID + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");//
+                $("#HCusID").val("");
+                $("#HDeptID").val("");
+                $("#HMangerID").val("");
+                sWhere = "";
+            }
+            //閲嶆柊鍚屾鎸夐挳
+            function set_ResCnz() {
+                var HBillno2 = $('#HBillno2').val();
+                $.ajax({
+                    url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
+                    type: "GET",
+                    data: { "HBillNo": HBillno2, "HBillType": 1401 },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                // 寰楀埌frame绱㈠紩
+                                var index = layer.getFrameIndex(window.name);
+                                //鍏抽棴褰撳墠frame
+                                layer.close(index);
+                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                window.location.reload();
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+        });
+
+
+
+
+    </script>
+
+</body>
+</html>

--
Gitblit v1.9.1