From 0d8fa0382e13fe46b9e06763dd1bce4ce07ee1fe Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 05 十一月 2021 16:53:30 +0800
Subject: [PATCH] 1

---
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html         |   53 
 WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html                |   10 
 WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBill.html            |   51 
 WebTM/views/index_Mobile.html                               |   22 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html                |    1 
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                    |    1 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html         |    2 
 WebTM/views/基础资料/公用基础资料/Gy_WorkType.html                    |  318 ++++
 WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html                   |   59 
 WebTM/views/基础资料/公用基础资料/Gy_Unit.html                        |    1 
 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html            |    6 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html  |   46 
 WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html              |    2 
 WebTM/views/领料发货/销售出库/Kf_SellOutBackBill_Fast.html          |    1 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html      |   52 
 WebTM/views/基础资料/公用基础资料/grf/器具改制入库单.grf                     |   32 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdMoveBill.html         |   41 
 WebTM/views/基础资料/公用基础资料/grf/器具其他出库单.grf                     |   23 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html                    |    1 
 WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html     |   76 
 WebTM/views/系统管理/公告/GG_NoticeBillList.html                  |  391 ++++++
 WebTM/layuiadmin/Scripts/webConfig.js                       |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkPayType.html        |  251 +++
 WebTM/views/领料发货/收料入库/Kf_ReciveBill_Fast.html               |  297 ++++
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html                    |    1 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBill.html          |   52 
 WebTM/WebTM.csproj                                          |    5 
 WebTM/views/基础资料/公用基础资料/grf/器具报废入库单.grf                     |   30 
 WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html                |    2 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html     |   55 
 WebTM/views/基础资料/公用基础资料/grf/器具改制出库单.grf                     |   22 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           |  318 ++-
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html       |   22 
 WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html |   54 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_OrderBackInfo.html      |  263 ++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html |   38 
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html                    |    1 
 WebTM/views/基础资料/公用基础资料/grf/器具处理出库单.grf                     |   24 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairOutBillEdit.html    |   53 
 WebTM/views/index.html                                      |    5 
 WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html     |   68 
 WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html               |    1 
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html                   |    3 
 WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html               |    4 
 WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html             |    2 
 WebTM/views/基础资料/公用基础资料/grf/器具采购入库单.grf                     |   23 
 WebTM/views/系统管理/公告/GG_NoticeBillEdit.html                  |  365 +++++
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html |    2 
 WebTM/views/系统管理/用户管理/Xt_UserSuplies.html                   |    2 
 WebTM/views/基础资料/公用基础资料/Gy_WorkPayType.html                 |  317 ++++
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html       |    3 
 WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html           |    2 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_WorkType.html           |  277 ++++
 WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html   |    8 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html  |   40 
 WebTM/views/模治具管理/模治具仓库管理/Sc_MouldOtherOutBillEdit.html     |   54 
 WebTM/views/基础资料/公用基础资料/grf/器具其他入库单.grf                     |   30 
 57 files changed, 3,493 insertions(+), 392 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index cbc89b0..e773e27 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
-    <History>True|2021-11-01T09:03:51.5854759Z;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|2021-11-05T07:51:16.8422280Z;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">
@@ -15,10 +15,10 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>11/01/2021 17:03:44</publishTime>
+      <publishTime>11/05/2021 15:51:09</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>11/01/2021 17:03:44</publishTime>
+      <publishTime>11/05/2021 15:51:09</publishTime>
     </File>
     <File Include="layuiadmin/config.js">
       <publishTime>06/10/2021 11:10:38</publishTime>
@@ -651,7 +651,7 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>11/01/2021 13:42:44</publishTime>
+      <publishTime>11/05/2021 13:08:13</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>10/08/2021 18:47:00</publishTime>
@@ -1104,7 +1104,7 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="views/home/console.html">
-      <publishTime>08/14/2021 00:32:42</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
       <publishTime>07/21/2021 09:19:26</publishTime>
@@ -1125,13 +1125,13 @@
       <publishTime>07/07/2021 16:04:21</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>11/01/2021 09:34:21</publishTime>
+      <publishTime>11/05/2021 15:51:03</publishTime>
     </File>
     <File Include="views/indexMenu.html">
       <publishTime>10/16/2021 17:25:19</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
       <publishTime>10/21/2021 09:01:42</publishTime>
@@ -1338,7 +1338,7 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="views/user/login.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/user/reg.html">
       <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1404,10 +1404,10 @@
       <publishTime>08/10/2021 14:32:09</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
       <publishTime>09/10/2021 09:46:57</publishTime>
@@ -1427,6 +1427,12 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
       <publishTime>10/13/2021 10:00:32</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html.html">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
@@ -1445,17 +1451,38 @@
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/b.grf">
       <publishTime>07/24/2021 00:34:41</publishTime>
     </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍝佽川绠$悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
       <publishTime>06/10/2021 11:21:39</publishTime>
@@ -1482,13 +1509,13 @@
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
       <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1497,55 +1524,61 @@
       <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>10/11/2021 17:21:26</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>10/11/2021 17:24:39</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>10/11/2021 17:21:26</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>10/11/2021 17:24:39</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>10/11/2021 17:21:26</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>10/11/2021 17:24:39</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">
       <publishTime>11/01/2021 09:34:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipTypeEdit.html">
-      <publishTime>11/01/2021 09:34:21</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">
       <publishTime>11/01/2021 09:34:21</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipTypeEdit.html">
-      <publishTime>11/01/2021 09:34:21</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
-      <publishTime>10/15/2021 08:23:50</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
-      <publishTime>10/15/2021 08:23:50</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">
+      <publishTime>11/01/2021 18:52:05</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">
+      <publishTime>11/01/2021 18:52:05</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
       <publishTime>08/24/2021 19:33:39</publishTime>
@@ -1554,13 +1587,13 @@
       <publishTime>05/24/2021 10:08:23</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
       <publishTime>08/24/2021 19:33:39</publishTime>
@@ -1569,10 +1602,10 @@
       <publishTime>05/24/2021 10:08:23</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -1584,7 +1617,7 @@
       <publishTime>09/10/2021 09:46:57</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>10/20/2021 22:10:58</publishTime>
+      <publishTime>11/01/2021 18:52:05</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
       <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1659,7 +1692,31 @@
       <publishTime>10/15/2021 08:23:50</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckEdit.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainEdit.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckEdit.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairEdit.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1671,7 +1728,7 @@
       <publishTime>09/10/2021 09:46:57</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>10/20/2021 22:10:58</publishTime>
+      <publishTime>11/01/2021 18:52:05</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
       <publishTime>08/27/2021 09:06:17</publishTime>
@@ -1680,7 +1737,7 @@
       <publishTime>10/04/2021 00:08:22</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1794,7 +1851,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
       <publishTime>10/11/2021 15:16:08</publishTime>
@@ -1806,7 +1863,7 @@
       <publishTime>10/11/2021 15:16:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
       <publishTime>10/11/2021 15:15:34</publishTime>
@@ -1905,16 +1962,16 @@
       <publishTime>10/29/2021 17:43:35</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
-      <publishTime>11/01/2021 16:58:45</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldMoveStockStepOutBill.html">
       <publishTime>09/16/2021 22:14:25</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
-      <publishTime>10/22/2021 18:51:27</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
-      <publishTime>10/22/2021 10:08:27</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
       <publishTime>07/23/2021 13:20:30</publishTime>
@@ -1926,76 +1983,76 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">
-      <publishTime>10/15/2021 08:23:50</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">
-      <publishTime>10/15/2021 08:23:50</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
-      <publishTime>10/22/2021 18:59:30</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
-      <publishTime>11/01/2021 17:03:44</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
-      <publishTime>10/18/2021 08:39:19</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillEdit.html">
-      <publishTime>10/22/2021 18:11:09</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">
-      <publishTime>10/22/2021 17:25:52</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">
-      <publishTime>10/22/2021 18:55:11</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">
-      <publishTime>10/22/2021 18:55:49</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">
-      <publishTime>10/22/2021 18:53:43</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
       <publishTime>10/15/2021 08:23:50</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">
-      <publishTime>10/22/2021 18:52:34</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
       <publishTime>10/29/2021 17:43:35</publishTime>
@@ -2013,10 +2070,10 @@
       <publishTime>09/13/2021 10:11:41</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
-      <publishTime>11/01/2021 09:34:21</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile_Edit.html">
       <publishTime>09/13/2021 09:24:54</publishTime>
@@ -2028,28 +2085,28 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>10/22/2021 19:07:32</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
-      <publishTime>10/22/2021 19:06:30</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>10/22/2021 19:05:31</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
-      <publishTime>10/18/2021 08:39:19</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
-      <publishTime>10/29/2021 10:01:27</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
-      <publishTime>10/22/2021 19:01:29</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>10/22/2021 19:08:26</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2070,13 +2127,13 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
-      <publishTime>11/01/2021 16:58:45</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
-      <publishTime>10/22/2021 18:51:27</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
-      <publishTime>10/22/2021 10:08:27</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
       <publishTime>07/23/2021 13:20:30</publishTime>
@@ -2088,22 +2145,22 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
-      <publishTime>10/22/2021 18:59:30</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2118,28 +2175,28 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>10/22/2021 19:07:32</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
-      <publishTime>10/22/2021 19:06:30</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>10/22/2021 19:05:31</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
-      <publishTime>10/18/2021 08:39:19</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
-      <publishTime>10/29/2021 10:01:27</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
-      <publishTime>10/22/2021 19:01:29</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>10/22/2021 19:08:26</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2178,10 +2235,10 @@
       <publishTime>10/19/2021 15:51:44</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
-      <publishTime>10/22/2021 18:57:22</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
-      <publishTime>10/15/2021 08:31:09</publishTime>
+      <publishTime>11/01/2021 18:52:05</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBill.html">
       <publishTime>10/15/2021 08:23:50</publishTime>
@@ -2193,13 +2250,13 @@
       <publishTime>10/11/2021 13:43:48</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/璁惧淇濆吇璁板綍鍗�/Sb_EquipMaintainBill_PDA.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/璁惧鐐规璁板綍鍗�/Sb_EquipDotCheckBill_PDA.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/璁惧缁翠慨璁板綍鍗�/Sb_EquipRepairWorkBill_PDA.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2343,10 +2400,10 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
-      <publishTime>10/22/2021 18:01:01</publishTime>
+      <publishTime>11/01/2021 18:39:51</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
-      <publishTime>10/22/2021 18:01:01</publishTime>
+      <publishTime>11/01/2021 18:39:51</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
       <publishTime>08/04/2021 19:13:55</publishTime>
@@ -2371,6 +2428,12 @@
     </File>
     <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriod_Edit.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
+    </File>
+    <File Include="views/绯荤粺绠$悊/鍏憡/GG_NoticeBillEdit.html">
+      <publishTime>11/05/2021 15:41:01</publishTime>
+    </File>
+    <File Include="views/绯荤粺绠$悊/鍏憡/GG_NoticeBillList.html">
+      <publishTime>11/05/2021 13:30:58</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
@@ -2397,7 +2460,7 @@
       <publishTime>10/19/2021 21:30:51</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserSuplies.html">
-      <publishTime>10/29/2021 17:43:35</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/绯荤粺鍙傛暟绠$悊/Xt_SystemParameterList.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
@@ -2418,13 +2481,13 @@
       <publishTime>09/27/2021 13:47:01</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">
-      <publishTime>10/11/2021 17:46:36</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>10/22/2021 19:16:26</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>10/22/2021 19:17:24</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -2439,7 +2502,7 @@
       <publishTime>10/22/2021 10:08:27</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>10/22/2021 19:14:45</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
@@ -2448,13 +2511,13 @@
       <publishTime>06/29/2021 11:09:03</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>10/22/2021 19:13:28</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/01/2021 18:45:57</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
       <publishTime>10/18/2021 08:39:19</publishTime>
@@ -2463,7 +2526,7 @@
       <publishTime>06/29/2021 11:09:29</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>10/22/2021 19:11:15</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
       <publishTime>10/15/2021 08:23:50</publishTime>
@@ -2472,16 +2535,16 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧妗f/Gy_EquipFileMainEdit.html">
-      <publishTime>11/01/2021 09:34:21</publishTime>
+      <publishTime>11/01/2021 18:52:05</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/璁惧妗f/Gy_EquipFileMainList.html">
       <publishTime>11/01/2021 09:34:21</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>09/08/2021 18:40:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
@@ -2502,13 +2565,16 @@
       <publishTime>09/08/2021 18:40:39</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
-      <publishTime>06/10/2021 11:10:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
+    </File>
+    <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBillList.html">
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
-      <publishTime>09/08/2021 18:40:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
-      <publishTime>10/22/2021 18:05:32</publishTime>
+      <publishTime>11/01/2021 18:50:46</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
       <publishTime>08/20/2021 14:12:37</publishTime>
@@ -2523,13 +2589,13 @@
       <publishTime>09/16/2021 22:14:25</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">
-      <publishTime>10/11/2021 17:46:36</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>10/22/2021 19:16:26</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>10/22/2021 19:17:24</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -2541,25 +2607,25 @@
       <publishTime>10/22/2021 10:08:27</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>10/22/2021 19:14:45</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>10/22/2021 19:13:28</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>10/26/2021 10:06:10</publishTime>
+      <publishTime>11/01/2021 18:45:57</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
       <publishTime>10/18/2021 08:39:19</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>10/22/2021 19:11:15</publishTime>
+      <publishTime>11/02/2021 14:32:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
       <publishTime>10/15/2021 08:23:50</publishTime>
@@ -2568,10 +2634,10 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>09/08/2021 18:40:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2589,13 +2655,13 @@
       <publishTime>09/08/2021 18:40:39</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
-      <publishTime>06/10/2021 11:10:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
-      <publishTime>09/08/2021 18:40:39</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
-      <publishTime>10/22/2021 18:05:32</publishTime>
+      <publishTime>11/01/2021 18:50:46</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
       <publishTime>08/20/2021 14:12:37</publishTime>
@@ -2640,7 +2706,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
-      <publishTime>09/27/2021 10:40:02</publishTime>
+      <publishTime>11/03/2021 16:26:36</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
       <publishTime>09/30/2021 12:31:10</publishTime>
@@ -2724,7 +2790,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>10/22/2021 17:25:52</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
       <publishTime>10/19/2021 16:08:25</publishTime>
@@ -2748,7 +2814,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>10/22/2021 17:25:52</publishTime>
+      <publishTime>11/05/2021 09:50:47</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2910,7 +2976,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>11/01/2021 17:03:49</publishTime>
+      <publishTime>11/05/2021 15:51:13</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 7ccd06f..fc5feef 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -138,13 +138,13 @@
     <Content Include="views\grf\鍣ㄥ叿棰嗙敤閫�搴撳崟.grf" />
     <Content Include="views\grf\鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf" />
     <Content Include="views\grf\鍣ㄥ叿鐩存帴璋冩嫧鍗�.grf" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍑哄簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿澶勭悊鍑哄簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鏀瑰埗鍑哄簱鍗�.grf" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿閲囪喘鍏ュ簱鍗�.grf" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\鍣ㄥ叿鍏朵粬鍏ュ簱鍗�.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
@@ -723,6 +723,8 @@
     <Content Include="views\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriodList.html" />
     <Content Include="views\绯荤粺绠$悊\浼氳鏈熼棿\Xt_AccountPeriod_Edit.html" />
+    <Content Include="views\绯荤粺绠$悊\鍏憡\GG_NoticeBillList.html" />
+    <Content Include="views\绯荤粺绠$悊\鍏憡\GG_NoticeBillEdit.html" />
     <Content Include="views\绯荤粺绠$悊\鍗曟嵁绫诲瀷\Xt_BillType_Edit.html" />
     <Content Include="views\绯荤粺绠$悊\鍗曟嵁绫诲瀷\Xt_BillTypeList.html" />
     <Content Include="views\绯荤粺绠$悊\鏃ュ織绠$悊\Xt_SystemLogList.html" />
@@ -789,6 +791,7 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Sc_StationInBill_Mul.html" />
     <Content Include="views\閲囪喘绠$悊\閲囪喘璁㈠崟\Cg_POOrderBillList.html" />
+    <Content Include="views\棰嗘枡鍙戣揣\鏀舵枡鍏ュ簱\Kf_ReciveBill_Fast.html" />
     <Content Include="views\楠屾敹鍏ュ簱\浜у搧鍏ュ簱\Kf_ProductInBillList.html" />
     <Content Include="views\楠屾敹鍏ュ簱\鍏朵粬鍏ュ簱\Kf_OtherInBillList.html" />
     <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Kf_ProductInBillList.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 802a542..916ca49 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,7 +5,7 @@
     var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 1aca07d..2fdc4b8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -807,6 +807,10 @@
                                         <dd><a lay-href="绯荤粺绠$悊/妯″潡绠$悊/Xt_XtgnbList.html">绯荤粺妯″潡淇℃伅鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">绯荤粺鍗曟嵁绫诲瀷鏌ヨ</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">浼氳鏈熼棿鏌ヨ</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">鍏憡淇℃伅</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">鍏憡淇℃伅缁存姢</a></dd>
+                                        <dd><a lay-href="GG_NoticeBillEdit.html">鍏憡淇℃伅</a></dd>
+                                        <dd><a lay-href="GG_NoticeBillList.html">鍏憡缁存姢</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -814,6 +818,7 @@
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserList.html">鐢ㄦ埛鍒楄〃</a></dd>
                                         <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserGroupList.html">瑙掕壊鍒楄〃</a></dd>
+                                        <dd><a lay-href="绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
                                         <dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
                                         <dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
                                     </dl>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index 80cb672..bd99eab 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -254,6 +254,24 @@
                               妯″叿閲囪喘鍏ュ簱鍗�
                           </a>
                       </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧淇濆吇璁板綍鍗�/Sb_EquipMaintainBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧淇濆吇璁板綍鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧缁翠慨璁板綍鍗�/Sb_EquipRepairWorkBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧缁翠慨璁板綍鍗�
+                          </a>
+                      </dd>
+                      <dd>
+                          <a lay-href="妯℃不鍏风鐞�/璁惧鐐规璁板綍鍗�/Sb_EquipDotCheckBill_PDA.html" style="color: aqua;">
+                              <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+                              璁惧鐐规璁板綍鍗�
+                          </a>
+                      </dd>
                   </dl>
               </li>
               <!-- 浠撳偍鏉$爜绠$悊 -->
@@ -354,9 +372,9 @@
                           </a>
                       </dd>
                       <dd>
-                          <a href="" target="main_self_frame" style="color: aqua;">
+                          <a href="棰嗘枡鍙戣揣/鏀舵枡鍏ュ簱/Kf_ReciveBill_Fast.html" target="main_self_frame" style="color: aqua;">
                               <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
-                              鍒拌揣鐐规暟n
+                              鍒拌揣鐐规暟
                           </a>
                       </dd>
                       <dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
index e0d4d0b..ca7483d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
@@ -42,7 +42,7 @@
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label">鐝粍</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="z" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
                                     <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroup-BT" style="width:40px;">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -92,7 +92,7 @@
                                 </div>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                <label class="layui-form-label">绂佺敤鏍囪</label>
                                 <div class="layui-input-inline">
                                     <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
                                     <input type="hidden" value="false" name="HStopflag" id="HStopflag">
@@ -109,7 +109,7 @@
                         </div>
 
                     </div>
-                    <input type="hidden" value="0" name="HParentID" id="HParentID">
+                    <!--<input type="hidden" value="0" name="HParentID" id="HParentID">-->
                 </form>
             </div>
         </div>
@@ -241,18 +241,17 @@
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HNumber": data.HNumber
-                                , "HItemID": data.HItemID
+                                "HItemID": data.HItemID
                                 , "HName": data.鏍哥畻鏂瑰紡鍚嶇О
                                 , "HNumber": data.鏍哥畻鏂瑰紡浠g爜
                                 , "HDeptName": data.閮ㄩ棬
-                                , "HDeptID": data.閮ㄩ棬浠g爜
+                                , "HDeptID": data.HDeptID
                                 , "hparentName": data.缁勫悕绉�
                                 , "hparentid": data.缁勪唬鐮�
                                 , "HGroupName": data.鐝粍鍚嶇О
-                                , "HGroupID": data.鐝粍浠g爜
-                                , "HStopflag": data.HStopflag
-                                , "HRemark": data.HRemark
+                                , "HGroupID": data.HGroupID
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
                             });
                             layer.close(ajaxLoad);
                         } else {
@@ -325,7 +324,6 @@
                         }
                         $("#HDeptName").val(checkStatus.data[0].HName);
                         $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -364,7 +362,7 @@
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , title: '鎵�灞炵粍鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
@@ -375,7 +373,7 @@
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
                         $("#hparentName").val(checkStatus.data[0].HName);
-                        $("#hparentID").val(checkStatus.data[0].HItemID);
+                        $("#hparentid").val(checkStatus.data[0].HItemID);
                         //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
new file mode 100644
index 0000000..893c39c
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
@@ -0,0 +1,263 @@
+锘�<!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">
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+    </style>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="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-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙嶉鐘舵�佷唬鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                    <input id="HParentID" name="HParentID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙嶉鐘舵�佸悕绉�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        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;
+        }
+
+        var params = getUrlVars();
+        var hID = params[params[0]];//缂栬緫鏌ョ湅
+        var HType = params[params[1]];    //鍗曟嵁鐘舵��
+        var TagParentId = params[params[2]];  //鐖剁骇ID
+
+        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;
+
+            //甯歌鐢ㄦ硶
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            //#region 澶撮儴宸ュ叿鏍忎簨浠�
+
+            //娓呴櫎
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var ModRightNameAdd = 'Gy_RepairType_Edit';
+                var user = sessionStorage["HUserName"];
+                var arr = new Array();
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = hID == "" ? 0 : hID;
+
+                data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
+
+                var oMain = JSON.stringify(data.field)
+                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
+                if (HType == "Modify") {
+
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_OrderBackInfo/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": 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);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_OrderBackInfo/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": oMain },
+                            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);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
+            //#endregion
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            if (HType == "Modify") {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_OrderBackInfo/xg",
+                    //url: "http://localhost:12761/Gy_Department/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": hID
+                    },
+                    success: function (d) {
+                        console.log(d);
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HYX").val(d.data[0].HYX);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html"
new file mode 100644
index 0000000..7aff4b9
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkPayType.html"
@@ -0,0 +1,251 @@
+锘�<!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">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="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-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+                                <!--<li>鍏朵粬淇℃伅</li>-->
+                                <!--</ul>-->
+                                <h1 style="text-align:center;"><b>宸ヨ祫绫诲瀷</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ヨ祫绫诲瀷浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ヨ祫绫诲瀷鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                         <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "Gy_WorkPayType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(HStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(HInterID) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_WorkPayType/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HNumber").val(data.宸ヨ祫绫诲瀷浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.宸ヨ祫绫诲瀷鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html"
new file mode 100644
index 0000000..4b976c4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_WorkType.html"
@@ -0,0 +1,277 @@
+锘�<!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">
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="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-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+                                <!--<li>鍏朵粬淇℃伅</li>-->
+                                <!--</ul>-->
+                                <h1 style="text-align:center;"><b>宸ョ</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ョ浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input name="HItemID" id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">宸ョ鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">灏忔椂宸ヨ祫</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HPayMoney" id="HPayMoney" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鏃ュ伐璧�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDayMoney" id="HDayMoney" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鑰冭檻浜烘暟</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HForEmp" lay-filter="HForEmp" id="HForEmp">
+                                                        <option value="鏄�">鏄�</option>
+                                                        <option value="鍚�">鍚�</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                        </div>
+                                         <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-input-inline">
+                                                <!--<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">-->
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" value="">
+                                            </div>
+                                        </div>
+                                       
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "Gy_WorkType/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainStr },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { icon: 1 });
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(HStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
+            //鐩戝惉鎻愪氦
+            form.verify({
+                numberOrEmpty: function (value, item) {
+                    // if (value != '') {
+                    if (!/^\d+$/.test(value)) {
+                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+                    }
+                    //}
+                }
+            });
+            //#endregion
+
+
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(HInterID) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Gy_WorkType/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            $("#HNumber").val(data.宸ョ浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.宸ョ鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄鐮�);//鍔╄浠g爜
+                            $("#HPayMoney").val(data.灏忔椂宸ヨ祫);//鍔╄浠g爜
+                            $("#HDayMoney").val(data.鏃ュ伐璧�);//鍔╄浠g爜
+                            $("#HForEmp").val(data.鑰冭檻浜烘暟);//鍔╄浠g爜
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+                            $("input[name='HStopflag']").attr("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+            //#endregion
+        });
+
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.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_ClassTimePrj.html"
index 8c43fb8..1492fed 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.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_ClassTimePrj.html"
@@ -81,6 +81,7 @@
                 , util = layui.util
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -158,11 +159,14 @@
                         , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                         , { field: '鏍哥畻鏂瑰紡浠g爜', title: '鏍哥畻鏂瑰紡浠g爜' }
                         , { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
-                        //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
                         , { field: '鐝粍鍚嶇О', title: '鐝粍' }
-                        , { field: '缁勫悕绉�', title: '鎵�灞炵粍' }
-                        , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
                         , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '缁勪唬鐮�', title: '缁勪唬鐮�' }
+                        , { field: '缁勫悕绉�', title: '缁勫悕绉�' }
                     ]]
                 };
             }
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_Currency.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_Currency.html"
index 3348dba..3ae9497 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.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_Currency.html"
@@ -124,6 +124,7 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 鍒濆鍖栬〃鏍�
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_DepartmentList.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_DepartmentList.html"
index d73c0f8..8e4d432 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.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_DepartmentList.html"
@@ -77,7 +77,7 @@
                 , laydate = layui.laydate
             var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
             var option = [];
-
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
 
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_EmployeeList.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_EmployeeList.html"
index 5d5fd61..04d7a6a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.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_EmployeeList.html"
@@ -78,6 +78,7 @@
             , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
         //#endregion
 
         //#region 杩涘叆椤甸潰鍗冲姞杞�
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_Material.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_Material.html"
index 1a37772..f8e009d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.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_Material.html"
@@ -94,6 +94,7 @@
             var sWhere = "";
 
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
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_QCCheckClass.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_QCCheckClass.html"
index 6d6da9b..a2387a7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.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_QCCheckClass.html"
@@ -342,7 +342,7 @@
                     }
                 });
             }
-
+        
             //鏂板
             function set_AddNew(obj)
             {
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_Unit.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_Unit.html"
index 60833c4..6e2f4eb 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.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_Unit.html"
@@ -107,6 +107,7 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            var Organization = sessionStorage["OrganizationID"];
 
             $.ajax({
                 url: GetWEBURL() + '/Gy_Unit/LoadTree',
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_Warehouse.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_Warehouse.html"
index 5651949..bb9db44 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.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_Warehouse.html"
@@ -85,6 +85,7 @@
                 , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -169,7 +170,7 @@
             }
             //#endregion
 
-
+           
 
             //#region 鏌ヨ
             function get_Display(sWhere) {
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_WorkPayType.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_WorkPayType.html"
new file mode 100644
index 0000000..93e3083
--- /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_WorkPayType.html"
@@ -0,0 +1,317 @@
+锘�<!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/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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '宸ヨ祫绫诲瀷浠g爜', title: '宸ヨ祫绫诲瀷浠g爜' }
+                        , { field: '宸ヨ祫绫诲瀷鍚嶇О', title: '宸ヨ祫绫诲瀷鍚嶇О' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                    ]]
+                    //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+                    //, done: function (res, cuur, count) {
+                    //    for (var i = 0; i < res.data.length; i++)
+                    //    {
+                    //        if (res.data[i].绂佺敤鏍囪=='Y') {
+                    //            $("table tbody tr").eq(i).css('color','red')
+                    //        }
+                    //    }
+                    //}
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkPayType/list',
+                    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 });
+                    }
+                });
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 宸ヨ祫绫诲瀷浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ヨ祫绫诲瀷鍚嶇О like '%" + HName + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkPayType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸ヨ祫绫诲瀷',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkPayType.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫宸ヨ祫绫诲瀷'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkPayType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_WorkPayType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkType.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_WorkType.html"
new file mode 100644
index 0000000..ef3ecfc
--- /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_WorkType.html"
@@ -0,0 +1,318 @@
+锘�<!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/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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+                            </div>
+                        </div>
+
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '宸ョ浠g爜', title: '宸ョ浠g爜' }
+                        , { field: '宸ョ鍚嶇О', title: '宸ョ鍚嶇О' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '灏忔椂宸ヨ祫', title: '灏忔椂宸ヨ祫' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                    ]]
+                    //灏嗙鐢ㄧ殑鏁版嵁鏍囩孩
+                    //, done: function (res, cuur, count) {
+                    //    for (var i = 0; i < res.data.length; i++)
+                    //    {
+                    //        if (res.data[i].绂佺敤鏍囪=='Y') {
+                    //            $("table tbody tr").eq(i).css('color','red')
+                    //        }
+                    //    }
+                    //}
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkType/list',
+                    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 });
+                    }
+                });
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 宸ョ浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ョ鍚嶇О like '%" + HName + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_WorkType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板宸ョ',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫宸ョ'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_WorkType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
index df458ea..dbc04db 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
             var sWhere = "";
-
+            var Organization = sessionStorage["OrganizationID"];
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..47edaf6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
 					Name='璋冨嚭浠撳簱'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='琛ㄤ綋澶囨敞'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
 				End
 				Item
 					Name='瀹℃牳浜�'
+				End
+				Item
+					Name='閮ㄩ棬'
 				End
 			End
 		End
@@ -217,7 +220,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +232,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +242,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='琛ㄤ綋澶囨敞'
 				End
 			End
 		End
@@ -556,7 +559,7 @@
 					Top=2.59292
 					Width=7.59354
 					Height=0.608542
-					DataField='璋冨叆浠撳簱'
+					DataField='浠撳簱'
 				End
 				Item
 					Type=Barcode
@@ -568,6 +571,15 @@
 					CaptionPosition=None
 					CheckSum=T
 					Text='#鍗曟嵁缂栧彿#'
+				End
+				Item
+					Type=FieldBox
+					Name='FieldBox11'
+					Left=2.80458
+					Top=1.79917
+					Width=4.60375
+					Height=0.608542
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -618,7 +630,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..851c307 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\205\266\344\273\226\345\207\272\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
 					Name='璋冨嚭浠撳簱'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='琛ㄤ綋澶囨敞'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
 				End
 				Item
 					Name='瀹℃牳浜�'
+				End
+				Item
+					Name='閮ㄩ棬'
 				End
 			End
 		End
@@ -217,7 +220,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +232,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +242,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='琛ㄤ綋澶囨敞'
 				End
 			End
 		End
@@ -620,7 +623,7 @@
 						Bold=T
 						Charset=134
 					End
-					DataField='璋冨叆浠撳簱'
+					DataField='浠撳簱'
 				End
 				Item
 					Type=MemoBox
@@ -671,7 +674,7 @@
 					Top=3.81
 					Width=5.21229
 					Height=0.582083
-					DataField='璋冨嚭浠撳簱'
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -722,7 +725,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..3f1d7b7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225.grf"
@@ -27,10 +27,10 @@
 					Format='yyyy/MM/dd'
 				End
 				Item
-					Name='璋冨嚭浠撳簱'
+					Name='閮ㄩ棬'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='琛ㄤ綋澶囨敞'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -217,7 +217,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +229,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +239,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='琛ㄤ綋澶囨敞'
 				End
 			End
 		End
@@ -391,7 +391,7 @@
 					Width=5.42396
 					Height=0.396875
 					TextAlign=MiddleCenter
-					Text='鍣ㄥ叿鍏朵粬鍑哄簱鍗�'
+					Text='鍣ㄥ叿澶勭悊鍑哄簱鍗�'
 				End
 				Item
 					Type=MemoBox
@@ -620,7 +620,7 @@
 						Bold=T
 						Charset=134
 					End
-					DataField='璋冨叆浠撳簱'
+					DataField='浠撳簱'
 				End
 				Item
 					Type=MemoBox
@@ -671,7 +671,7 @@
 					Top=3.81
 					Width=5.21229
 					Height=0.582083
-					DataField='璋冨嚭浠撳簱'
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -722,7 +722,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..6990374 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
 					Name='璋冨嚭浠撳簱'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='鏀舵枡浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='瀛愬娉�'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
 				End
 				Item
 					Name='瀹℃牳浜�'
+				End
+				Item
+					Name='閮ㄩ棬'
 				End
 			End
 		End
@@ -217,7 +220,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +232,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +242,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='瀛愬娉�'
 				End
 			End
 		End
@@ -556,7 +559,7 @@
 					Top=2.59292
 					Width=7.59354
 					Height=0.608542
-					DataField='璋冨叆浠撳簱'
+					DataField='鏀舵枡浠撳簱'
 				End
 				Item
 					Type=Barcode
@@ -568,6 +571,15 @@
 					CaptionPosition=None
 					CheckSum=T
 					Text='#鍗曟嵁缂栧彿#'
+				End
+				Item
+					Type=FieldBox
+					Name='FieldBox11'
+					Left=2.80458
+					Top=1.79917
+					Width=6.19125
+					Height=0.608542
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -618,7 +630,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
index 2e2b8c2..dbcf8ba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225.grf"
@@ -30,7 +30,7 @@
 					Name='璋冨嚭浠撳簱'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='瀛愬娉�'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -102,6 +102,9 @@
 				End
 				Item
 					Name='瀹℃牳浜�'
+				End
+				Item
+					Name='閮ㄩ棬'
 				End
 			End
 		End
@@ -217,7 +220,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +232,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +242,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='瀛愬娉�'
 				End
 			End
 		End
@@ -391,7 +394,7 @@
 					Width=5.42396
 					Height=0.396875
 					TextAlign=MiddleCenter
-					Text='鍣ㄥ叿鍏朵粬鍏ュ簱鍗�'
+					Text='鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�'
 				End
 				Item
 					Type=MemoBox
@@ -556,7 +559,7 @@
 					Top=2.59292
 					Width=7.59354
 					Height=0.608542
-					DataField='璋冨叆浠撳簱'
+					DataField='浠撳簱'
 				End
 				Item
 					Type=Barcode
@@ -568,6 +571,15 @@
 					CaptionPosition=None
 					CheckSum=T
 					Text='#鍗曟嵁缂栧彿#'
+				End
+				Item
+					Type=FieldBox
+					Name='FieldBox11'
+					Left=2.80458
+					Top=1.79917
+					Width=3.20146
+					Height=0.608542
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -618,7 +630,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
index d06b8e2..34d56e6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225.grf"
@@ -27,10 +27,10 @@
 					Format='yyyy/MM/dd'
 				End
 				Item
-					Name='璋冨嚭浠撳簱'
+					Name='閮ㄩ棬'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='浠撳簱'
 				End
 				Item
 					Name='鍙戝嚭鍗曚綅'
@@ -50,13 +50,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='琛ㄤ綋澶囨敞'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -217,7 +217,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +229,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +239,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='琛ㄤ綋澶囨敞'
 				End
 			End
 		End
@@ -620,7 +620,7 @@
 						Bold=T
 						Charset=134
 					End
-					DataField='璋冨叆浠撳簱'
+					DataField='浠撳簱'
 				End
 				Item
 					Type=MemoBox
@@ -671,7 +671,7 @@
 					Top=3.81
 					Width=5.21229
 					Height=0.582083
-					DataField='璋冨嚭浠撳簱'
+					DataField='閮ㄩ棬'
 				End
 			End
 			RepeatOnPage=T
@@ -722,7 +722,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf" "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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
index f0af061..ad11958 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
+++ "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/grf/\345\231\250\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225.grf"
@@ -30,11 +30,10 @@
 					Name='璋冨嚭浠撳簱'
 				End
 				Item
-					Name='璋冨叆浠撳簱'
+					Name='鏀舵枡浠撳簱'
 				End
 				Item
-					Name='鍙戝嚭鍗曚綅'
-					DBFieldName='璋冨嚭缁勭粐'
+					Name='寰�鏉ュ崟浣�'
 				End
 				Item
 					Name='鎺ユ敹鍗曚綅'
@@ -50,13 +49,13 @@
 					Name='瑙勬牸鍨嬪彿'
 				End
 				Item
-					Name='鍗曚綅'
+					Name='璁¢噺鍗曚綅'
 				End
 				Item
-					Name='鏁伴噺'
+					Name='瀹炴敹鏁伴噺'
 				End
 				Item
-					Name='澶囨敞'
+					Name='琛ㄤ綋澶囨敞'
 				End
 				Item
 					Name='鍒跺崟浜�'
@@ -217,7 +216,7 @@
 						Charset=134
 					End
 					WordWrap=T
-					DataField='鍗曚綅'
+					DataField='璁¢噺鍗曚綅'
 				End
 				Item
 					Column='Column9'
@@ -229,7 +228,7 @@
 					End
 					WordWrap=T
 					ShrinkFontToFit=T
-					DataField='鏁伴噺'
+					DataField='瀹炴敹鏁伴噺'
 				End
 				Item
 					Column='Column12'
@@ -239,7 +238,7 @@
 						Weight=400
 						Charset=134
 					End
-					DataField='澶囨敞'
+					DataField='琛ㄤ綋澶囨敞'
 				End
 			End
 		End
@@ -587,7 +586,7 @@
 					Top=1.79917
 					Width=6.985
 					Height=0.608542
-					DataField='鍙戝嚭鍗曚綅'
+					DataField='寰�鏉ュ崟浣�'
 				End
 				Item
 					Type=FieldBox
@@ -596,7 +595,7 @@
 					Top=2.59292
 					Width=7.59354
 					Height=0.608542
-					DataField='璋冨叆浠撳簱'
+					DataField='鏀舵枡浠撳簱'
 				End
 			End
 			RepeatOnPage=T
@@ -647,7 +646,7 @@
 									Width=2.59292
 									Height=0.396875
 									TextAlign=MiddleCenter
-									DataField='鏁伴噺'
+									DataField='瀹炴敹鏁伴噺'
 								End
 							End
 							ColSpan=2
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index f65f189..2c334bf 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,6 +84,7 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 9940913..524c6be 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,6 +82,7 @@
                 , laydate = layui.laydate
             var sWhere = "";
             var option = [];
+            var Organization = sessionStorage["OrganizationID"];
             //#endregion
 
             //#region 杩涘叆椤甸潰鏃㈠姞杞�
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_Add_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
index 6e82c21..7acb9e9 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_Add_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_Add_MouldProdBackBillList.html"
@@ -31,7 +31,7 @@
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                 <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+            <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
                                 <h1 style="text-align:center;"><b>鍣ㄥ叿閫�搴撳崟</b></h1>
@@ -156,7 +156,21 @@
                                 </div>
                             </div>
                         </div>
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -213,6 +227,7 @@
 
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3803";
             //#endregion
@@ -222,6 +237,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -681,6 +697,36 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHSonID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -764,8 +810,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html"
index e2cce6a..fdde849 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_Add_MouldProdOutBillList.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_Add_MouldProdOutBillList.html"
@@ -30,12 +30,11 @@
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
 
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                 <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+            <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
                                 <h1 style="text-align:center;"><b>鍣ㄥ叿棰嗙敤鍗�</b></h1>
@@ -140,8 +139,21 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -244,6 +256,28 @@
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
+            var option1 = {
+                id:'#mainTable1'
+                ,elem: '#mainTable1'
+                , height: 500
+                , page: true //寮�鍚垎椤�
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ]]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+            };
+
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -258,11 +292,11 @@
                     type: "GET",
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
-                        //console.log(result);
-                        //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
index 8de89ac..7d7917e 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_MouldMoveStockStepInBill.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_MouldMoveStockStepInBill.html"
@@ -163,7 +163,20 @@
                                     </div>
                                 </div>
                             </div>
-                            <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鏄庣粏淇℃伅</li>
+                                    <li>姹囨�讳俊鎭�</li>
+                                </ul>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                    </div>
+                                    <div class="layui-tab-item">
+                                        <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                    </div>
+                                </div>
+                            </div>
                             <script type="text/html" id="toolbarDemo">
                                 <div class="layui-btn-container">
                                     <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -271,6 +284,27 @@
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
                 ]]
             };
+            var option1 = {
+                elem: '#mainTable1'
+                , height: 500
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+                , page: true //寮�鍚垎椤�
+                , cols: [[ //琛ㄥご
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '璋冨叆浠撳簱浠g爜', title: '璋冨叆浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ]]
+            };
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -288,8 +322,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
index f6e7fce..318cc1c 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_MouldMoveStockStepOutBill.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_MouldMoveStockStepOutBill.html"
@@ -148,7 +148,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -259,6 +273,24 @@
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
+            var option1 = {
+                elem: '#mainTable1'
+                , height: 500
+                , page: true //寮�鍚垎椤�
+                , cols: [{ type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hscwhid', title: 'hscwhid', edit: 'text', width: 100, hide: true }
+                    , { field: '璋冨嚭浠撳簱浠g爜', title: '璋冨嚭浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+            };
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -276,8 +308,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
index 3ddfc59..2c7125b 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_MouldOtherOutBillEdit.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_MouldOtherOutBillEdit.html"
@@ -35,7 +35,7 @@
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
                                 <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+            <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
                                 <h1 style="text-align:center;"><b>鍏朵粬鍑哄簱鍗�</b></h1>
@@ -140,8 +140,20 @@
                                 </div>
                             </div>
                         </div>
-
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -198,6 +210,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sBillType = "3828";
             //#endregion
 
@@ -551,6 +564,7 @@
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
                 Table();  //淇濆吇椤瑰垪琛�
+                Table1();  //姹囨�诲垪琛�
             }
             //鍒濆鍖栦繚鍏婚」鍒楄〃
             function Table() {
@@ -588,6 +602,35 @@
                     , elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+            function Table1() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHSonID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
                     , cellMinWidth: 120
                     , height: 500
                     , cols: [columns]
@@ -677,9 +720,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
-
+                            option1.data = result.list[1];
+                            table.render(option1);
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
                         }
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 f6b7bea..382d2a8 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"
@@ -546,8 +546,6 @@
             form.on('submit(Exit)', function (data) {
                 Pub_Close(1);
             });
-
-
             //棰勮
             form.on("submit(planview)", function (data) {
                 if (linterid != "" || linterid != null) {
@@ -566,7 +564,6 @@
                     layer.msg('褰撳墠鍗曟嵁ID涓虹┖锛�');
                 }
             });
-
             //鎵撳嵃
             form.on("submit(print)", function (data) {
                 if (linterid != "" || linterid != null) {
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_MouldProdMoveBill.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_MouldProdMoveBill.html"
index 159c90a..4ef6655 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_MouldProdMoveBill.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_MouldProdMoveBill.html"
@@ -148,7 +148,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -258,6 +272,27 @@
                 ]]
                 , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
             };
+            var option1 = {
+                elem: '#mainTable1'
+                , 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: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HSCWHID', title: 'HSCWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '璋冨嚭浠撳簱浠g爜', title: '璋冨嚭浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ]
+                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+            };
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -275,8 +310,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
index 6bc3c3a..8acd76d 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBillEdit.html"
@@ -161,7 +161,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -218,6 +232,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3802";
             
@@ -228,6 +243,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -684,6 +700,36 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -768,8 +814,10 @@
                         //console.log(result);
                         //console.log('gouba' + result);
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
index 1fe812a..5a22532 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_MouldRepairInBillEdit.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_MouldRepairInBillEdit.html"
@@ -36,7 +36,7 @@
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
                             <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
                             <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
+            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
                             <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -247,7 +247,22 @@
 
                         </div>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鏄庣粏淇℃伅</li>
+                            <li>姹囨�讳俊鎭�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                            </div>
+                        </div>
+                    </div>
+
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -292,6 +307,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3826";
             
@@ -303,6 +319,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -869,6 +886,36 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '浠撳簱', title: '浠撳簱', edit: 'text', width: 120 }
+                    , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -968,8 +1015,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
index c011cd2..3c8161d 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_MouldRepairOutBillEdit.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_MouldRepairOutBillEdit.html"
@@ -250,7 +250,22 @@
 
                         </div>
                     </div>
-                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+
+                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">鏄庣粏淇℃伅</li>
+                            <li>姹囨�讳俊鎭�</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                            </div>
+                        </div>
+                    </div>
+
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
@@ -295,6 +310,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3825";
             //TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
@@ -306,6 +322,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -866,6 +883,36 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '浠撳簱', title: '浠撳簱', edit: 'text', width: 120 }
+                    , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -965,8 +1012,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldScrapInBill.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_MouldScrapInBill.html"
index cdf11a0..ed67a57 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_MouldScrapInBill.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_MouldScrapInBill.html"
@@ -171,7 +171,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -227,6 +241,7 @@
                 , element = layui.element;
             //鏌ヨ鏉′欢
             var option = [];
+            var option1 = [];
             var sWhere = "";
             var sBillType = "3831";
             //TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HPropertyID": 0, "HPropertyCode": "", "HPropertyName": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"],"HRemark": "" };
@@ -237,6 +252,7 @@
             set_InitFrom();
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鏂板
                 set_AddFNew();
@@ -727,6 +743,36 @@
                     }
                 };
             }
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鏀舵枡浠撳簱浠g爜', title: '鏀舵枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鏀舵枡浠撳簱鍚嶇О', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+                    , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -811,8 +857,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
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_MouldScrapOutBill.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_MouldScrapOutBill.html"
index be35af7..d3eca16 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_MouldScrapOutBill.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_MouldScrapOutBill.html"
@@ -160,7 +160,21 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
+
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -228,7 +242,7 @@
 
             //鍒濆鍖栬〃鏍�
             set_InitGrid();
-
+            set_CountGrid();
             //鍒ゆ柇鎿嶄綔绫诲瀷
             if (OperationType == 1) {//鏃犳簮鍗�
                 set_AddFNew();
@@ -685,7 +699,36 @@
                     }
                 };
             }
-
+            //鍒濆姹囨�讳俊鎭�
+            function set_CountGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'hwhid1', title: 'HWHID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戣揣浠撳簱浠g爜', title: '鍙戣揣浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戣揣浠撳簱鍚嶇О', title: '鍙戣揣浠撳簱鍚嶇О', edit: 'text', width: 120 }
+                    , { field: '瀛愬娉�', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -789,8 +832,10 @@
                     data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index a3ceb17..d448c29 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -120,20 +120,20 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <!--<div class="layui-inline">
+                                        <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                 </button>
                                             </div>
-                                        </div>-->
+                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -143,7 +143,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -167,7 +167,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
                                             <div class="layui-input-block" style="margin-left: 80px;">
-                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -179,7 +179,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -197,7 +197,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -213,7 +213,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                 <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
                                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -430,6 +430,43 @@
             form.on('submit(btnSave)', function (data) {//鎻愪氦
                 set_btnSave(data);
             })
+
+            //瀵瑰簲Erp鐗╂枡
+            form.on('submit(btnHMaterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/PartInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
 
             //妯″叿鍒嗙被
             form.on('submit(btnHMouleList)', function () {
@@ -833,8 +870,8 @@
                         $("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
                         $("#HPICNo").val(d.data[0].鍥惧彿);
                         $("#HWorkMaterModel").val(d.data[0].鐢熶骇浜у搧鍨嬪彿);
-                        //$("#HMaterID").val(d.data[0].HMaterID);
-                        //$("#HMaterNumber").val(d.data[0].HMaterNumber);
+                        $("#HMaterID").val(d.data[0].HMaterID);
+                        $("#HMaterNumber").val(d.data[0].瀵瑰簲ERP鐗╂枡缂栫爜);
                         $("#HMouleTypeID").val(d.data[0].HMouldTypeID);
                         $("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
                         $("#HUnitID").val(d.data[0].HUnitID);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index f08d8fc..79964b7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -158,6 +158,7 @@
                         , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                         , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
                         , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿' }
                         , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
                         , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
                         , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 53a4020..da07288 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -1051,7 +1051,7 @@
         function AllowLoadData(sSubStr) {
            
 
-            if ($("#HMouldCode").val() == '') {
+            if ($("#HMouldCodeHMouldCode").val() == '') {
                 layer.msg("鎴愬搧鍣ㄥ叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
index 1e38a89..be8a834 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBill.html"
@@ -141,7 +141,20 @@
                             </div>
                         </div>
 
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">鏄庣粏淇℃伅</li>
+                                <li>姹囨�讳俊鎭�</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -552,6 +565,7 @@
             //鍒濆鍖栬〃鏍�
             function set_InitGrid() {
                 Table();  //淇濆吇椤瑰垪琛�
+                Table1();  //姹囨�婚」鍒楄〃
             }
             //鍒濆鍖栦繚鍏婚」鍒楄〃
             function Table() {
@@ -593,7 +607,36 @@
                     }
                 };
             }
-
+            //鍒濆鍖栦繚鍏婚」鍒楄〃
+            function Table1() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterCode', width: 100 }
+                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', edit: 'text', width: 100 }
+                    , { field: '鎵规', title: '鎵规', edit: 'text', width: 100 }
+                    , { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
+                    , { field: 'HWHSonID', title: 'HWHSonID', edit: 'text', width: 100, hide: true }
+                    , { field: '鍙戞枡浠撳簱浠g爜', title: '鍙戞枡浠撳簱浠g爜', edit: 'text', event: 'HWHCode', width: 120 }
+                    , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', edit: 'text', width: 120 }
+                    , { field: '琛ㄤ綋澶囨敞', title: '澶囨敞', edit: 'text', width: 100 }
+                ];
+                option1 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , height: 500
+                    , page: true
+                    , limit: 500
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
             //鏃犳簮鍗曟柊澧�
             function set_AddFNew() {
                 //鑾峰彇鏈�澶у崟鎹彿
@@ -675,8 +718,10 @@
                     data: { "sqlWhere": "and hmainid=" + hID },
                     success: function (result) {
                         if (result.count == 1) {
-                            option.data = result.data;
+                            option.data = result.list[0];
                             table.render(option);
+                            option1.data = result.list[1];
+                            table.render(option1);
 
                         } else {
                             layer.alert(result.code + result.Message, { icon: 5 });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
index 7d7cfe8..dddba79 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>璁惧缁翠慨璁板綍鍗�</title>
+    <title>璁惧淇濆吇璁板綍鍗�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -94,21 +94,15 @@
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+                                            <label class="layui-form-label" style="width: 75px;">寮�濮嬫棩鏈�:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+                                            <label class="layui-form-label" style="width: 75px;">缁撴潫鏃ユ湡:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -136,32 +130,6 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
-                                            </div>
-                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
                                             <div class="layui-input-block">
@@ -288,11 +256,11 @@
 
             //鏃ユ湡鏃堕棿閫夋嫨鍣�
             laydate.render({
-                elem: '#HRepairBeginDate'
+                elem: '#HBeginDate'
                 , type: 'datetime'
             });
             laydate.render({
-                elem: '#HRepairEndDate'
+                elem: '#HEndDate'
                 , type: 'datetime'
             });
             laydate.render({
@@ -360,9 +328,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarModel": data.HModel2
+                                    "HEquipID":data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -401,14 +369,14 @@
                     layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-                if (!$("#HEmpID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HRepairID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if (!$("#HEmpID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HRepairID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 if (!$("#HManagerID").val()) {
                     layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
index 7b7c88a..ab21465 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
@@ -94,21 +94,15 @@
                                 <div class="layui-form-item" style="padding-top: 10px;">
                                     <div class="layui-row">
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+                                            <label class="layui-form-label" style="width: 75px;">鐐规寮�濮嬫棩鏈�:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
+                                                <input type="datetime" class="layui-input" name="HBeginDate" id="HBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+                                            <label class="layui-form-label" style="width: 75px;">鐐规缁撴潫鏃ユ湡:</label>
                                             <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                                                <input type="datetime" class="layui-input" name="HEndDate" id="HEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
@@ -136,32 +130,6 @@
                                         </div>
                                     </div>
                                     <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
-                                                <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
-                                                <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
-                                            <div class="layui-input-block" style="margin-left: 85px;">
-                                                <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
-                                            </div>
-                                        </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
                                             <div class="layui-input-block">
@@ -288,11 +256,11 @@
 
             //鏃ユ湡鏃堕棿閫夋嫨鍣�
             laydate.render({
-                elem: '#HRepairBeginDate'
+                elem: '#HBeginDate'
                 , type: 'datetime'
             });
             laydate.render({
-                elem: '#HRepairEndDate'
+                elem: '#HEndDate'
                 , type: 'datetime'
             });
             laydate.render({
@@ -360,9 +328,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID":data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarModel": data.HModel2
+                                    "HEquipID": data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -401,24 +369,24 @@
                     layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return;
                 }
-                if (!$("#HEmpID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HRepairID").val()) {
-                    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                if (!$("#HManagerID").val()) {
-                    layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
+                //if (!$("#HEmpID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HRepairID").val()) {
+                //    layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                //if (!$("#HManagerID").val()) {
+                //    layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainSub = JSON.stringify(data.field);
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
+                    url: GetWEBURL() + "/Sb_EquipDotCheckBill/EquipDotCheckBill_Save",
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
index c483f12..9a8c1f2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
@@ -360,9 +360,9 @@
                             if (result.count == 1) {
                                 var data = result.data[0];
                                 form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                    "HEquipID": data.hinterid,
-                                    "HBarName": data.HName,
-                                    "HBarSpec": data.HModel
+                                    "HEquipID": data.hmainid,
+                                    "HBarName": data.璁惧鍚嶇О,
+                                    "HBarModel": data.璁惧鍨嬪彿
                                 });
                                 $("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
                                 $("#HBarCode").css("background-color", "#efefef4d");
@@ -418,7 +418,7 @@
                 var index = layer.load();
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
+                    url: GetWEBURL() + "/Sb_EquipRepairWorkBill/EquipRepairWorkBill_Save",
                     async: true,
                     data: { "sMainSub": sMainSub },
                     dataType: "json",
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
new file mode 100644
index 0000000..a673665
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillEdit.html"
@@ -0,0 +1,365 @@
+锘�<!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">
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+    </style>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="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-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <!--<ul class="layui-tab-title">
+                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
+                                <!--<li>鍏朵粬淇℃伅</li>-->
+                                <!--</ul>-->
+                                <h1 style="text-align:center;"><b>鎵嬪姩鍏憡</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">涓婚<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HContext" lay-verify="HContext" id="HContext"  autocomplete="off">
+                                                    <input id="HInterID" name="HInterID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off"  model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙戦�侀儴闂�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDept" id="HDept" readonly class="layui-input">
+                                                    <input type="hidden" name="HDeptID" id="HDeptID" readonly class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍙戦�佷汉<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HSendMan" id="HSendMan" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鎺ユ敹浜�<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HReceiveMan" id="HReceiveMan" readonly class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">绱ф�ョ▼搴�</label>
+                                                <div class="layui-input-inline">
+                                                    <select name="HLevel" id="HLevel" lay-filter="HLevel" class="layui-input" value="" style="float:left;width:150px">
+                                                        <option value="0">鏅��</option>
+                                                        <option value="1">绱ф��</option>
+                                                    </select>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">璇︾粏鍐呭<label style="color:red"> * </label></label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HDescription" id="HDescription" style="width:480px;"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script type="text/html" id="barDemo">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    </script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺路
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鏂板
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid(linterid);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+
+            //琛ㄥご鎺ユ敹浜哄脊绐�
+            form.on('submit(HManagerList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '璐熻矗浜哄垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/PeopleInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        var str = "";
+                        for (var i = 0; i < checkStatus.data.length; i++) {
+                            str += checkStatus.data[i].HName + ",";
+                        }
+                        //鍘绘帀鏈�鍚庝竴涓�楀彿(濡傛灉涓嶉渶瑕佸幓鎺夛紝灏变笉鐢ㄥ啓)
+                        if (str.length > 0) {
+                           tr = str.substr(0, str.length - 1);
+                        }
+                        $("#HManagerName").val(str);
+                        
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+                //debugger;
+                var refSav = "";
+                if (linterid == "" || linterid == null) {
+                    refSav = "Add";
+                }
+                if (linterid != "" && linterid != null) {
+                    refSav = "Update";
+                }
+                var sMainStr = JSON.stringify(data.field) + ";" + sessionStorage["HUserName"];
+                var sSubStr = data.field.HReceiveMan.substring(str1.indexOf(",") + 1, str1.indexOf(","));
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ';' + sessionStorage["HUserName"];
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/GG_Notice/SaveGetGG_NoticeBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        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 {
+
+                                layer.alert(data.Message);
+                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+
+                            layer.alert("閿欒:" + err);
+                            console.log("Reason" + sMainStr);
+                        }
+                    });
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
+            });
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+                });
+            }
+            
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏃ユ湡
+                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));   //鏃ユ湡
+                $("#HDept").val(sessionStorage["HDept"]);   //閮ㄩ棬
+                $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
+                $("#HSendMan").val(sessionStorage["HUserName"]); //褰撳墠鐧诲綍鐢ㄦ埛
+            }
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldScrapInHouseBillList[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HWHID": data.HWHID                    //浠撳簱ID
+                                , "HWHName": data.浠撳簱鍚嶇О               //浠撳簱鍚嶇О
+                                , "HSecManagerID": data.HSecManagerID    //楠屾敹鍛業D
+                                , "HSecManagerName": data.楠屾敹鍛樺悕绉�     //楠屾敹鍛樺悕绉�
+                                , "HKeeperID": data.HKeeperID            //淇濈鍛業D
+                                , "HKeeperName": data.淇濈鍛樺悕绉�         //淇濈鍛樺悕绉�
+                                , "HManagerID": data.HManagerID          //璐熻矗浜篒D
+                                , "HManagerName": data.璐熻矗浜哄悕绉�        //璐熻矗浜哄悕绉�
+                                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О              //閮ㄩ棬鍚嶇О
+                                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                                , "XDH": ""                               //閫夊崟鍙�
+                                , "HExplanation": data.鎽樿              //鎽樿
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
+                                , "HSupName": data.寰�鏉ュ崟浣�              //鎽樿
+                                , "HSupID": data.HSupID                    //澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //鏃ユ湡鏍煎紡鍖�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+            //闈炵┖楠岃瘉
+            function AllowLoadData() {  //闈炵┖楠岃瘉
+                var Result = true;
+                if ($("#HContext").val() == '' || $("#HContext").val() == null) {
+                    layer.msg("鍏憡涓婚涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HSendMan").val() == '' || $("#HSendMan").val() == null) {
+                    layer.msg("鍙戦�佷汉涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HReceiveMan").val() == '' || $("#HReceiveMan").val() == null) {
+                    layer.msg("鎺ユ敹浜轰笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if ($("#HDescription").val() == '' || $("#HDescription").val() == null) {
+                    layer.msg("璇︾粏鍐呭涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                else {
+                    return Result = true;
+                }
+                return Result;
+            }
+            //#endregion
+
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
new file mode 100644
index 0000000..0defd71
--- /dev/null
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\345\205\254\345\221\212/GG_NoticeBillList.html"
@@ -0,0 +1,391 @@
+锘�<!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/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;
+        }
+
+        .layui-body {
+            overflow-y: scroll;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span>鏇村</span>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍏憡鐘舵��</label>
+                                    <div class="layui-input-block">
+                                        <select name="HReadFlag" lay-filter="HReadFlag" style="width:190px;">
+                                            <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                            <option value="0">鏈槄</option>
+                                            <option value="1">宸查槄</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+                                    </div>
+                                </div>
+
+                                <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 class="layui-inline">
+                                        <label class="layui-form-label">鍙戦�佷汉</label>
+                                        <div class="layui-input-block">
+                                            <input type="text" class="layui-input" name="HSendMan" id="HSendMan" style="width:190px;">
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label">绱ф�ョ▼搴�</label>
+                                        <div class="layui-input-block">
+                                            <select name="HLevel" lay-filter="HLevel" style="width:190px;">
+                                                <option value="-1" selected="selected">鍏ㄩ儴</option>
+                                                <option value="0">鏅��</option>
+                                                <option value="1">绱ф��</option>
+                                            </select>
+                                        </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>
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鍔犺浇鏁版嵁鍒扮綉鏍�
+                get_Display(sWhere);
+            //#endregion
+
+            //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+                //澶村伐鍏锋爮浜嬩欢
+                table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add':set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit':set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete':set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+
+                //閲嶇疆鎸夐挳
+                form.on('submit(btnReSearch)', function (data) {
+                    set_ClearQuery();
+                });
+
+                //鏌ヨ鎸夐挳
+                form.on('submit(btnSearch)', function (data) {
+                    get_FastQuery();
+                });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+                //鍒濆鍖栬〃鏍�
+                function set_InitGrid() {
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                var columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { field: 'HInterID', title: '涓诲唴鐮�', width: 200, hide: true }
+                    , { field: 'HEntryID', title: '瀛愬唴鐮�', width: 200, hide: true }
+                    , { field: 'HContext', title: '涓婚', width: 200 }
+                    , { field: 'HDeptName', title: '鍙戦�侀儴闂�', width: 200 }
+                    , { field: 'HSendMan', title: '鍙戦�佷汉', width: 110 }
+                    , { field: 'HReceiveMan', title: '鎺ユ敹浜�', width: 200}
+                    , { field: 'HLevel', title: '绱ф�ョ▼搴�', width: 200 }
+                    , { field: 'HDescription', title: '璇︾粏鍐呭', width: 200 }
+                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
+                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    , { field: 'HUpDater', title: '淇敼浜�', width: 200 }
+                    , { field: 'HUpDateDate', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.HUpDateDate ==null ?'':layui.util.toDateString(d.HUpDateDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                ];
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , limit: 10
+                    , height: 'full-50'
+                    , cols: [columns]
+                    , limits: [50, 500, 1000, 5000]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                var wait = layer.load();//閬僵
+                
+                $.ajax({
+                    url: GetWEBURL() + '/GG_Notice/Get_GG_NoticeBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere, "user": "001" },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            DataList = data1.data;
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(wait);
+                        } else {
+                            layer.close(wait);
+                            layer.alert(data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        get_FastQuery(table, option);
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //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: 'GG_NoticeBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            get_FastQuery(table, option);
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MouldScrapInBill/set_DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            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 });
+                                }
+                                layer.close(wait);
+                            }, error: function () {
+                                layer.close(wait);
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            function get_FastQuery() {
+                var HStatus = $("select[name='HStatus']").val();//鐘舵��
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+                var HSendMan = $("#HSendMan").val();//鍙戦�佷汉
+                var HLevel = $("select[name='HLevel']").val();//绱ф�ョ▼搴�
+                if (HStatus) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏈槄
+                            sWhere += " and B.HReadFlag='0'";
+                            break;
+                        case '1':    //宸查槄
+                            sWhere += " and B.HReadFlag='1'";
+                            break;
+                        default:
+                    }
+                }
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),A.HDate, 23) >= '" + HBeginDate + "'";
+                }
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),A.HDate, 23) <= '" + HEndDate + "'";
+                }
+                if (HSendMan) {
+                    sWhere += " and HSendMan like '%" + HSendMan + "%'";
+                }
+                if (HLevel) {
+                    switch (HStatus) {
+                        case '-1':   //鍏ㄩ儴
+                            sWhere += "";
+                            break;
+                        case '0':    //鏅��
+                            sWhere += " and A.HLevel='鏅��'";
+                            break;
+                        case '1':    //绱ф��
+                            sWhere += " and A.HLevel='绱ф��'";
+                            break;
+                        default:
+                    }
+                }
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $('#HStatus').find("option[value='-1']").attr("selected", true);
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HSendMan").val("");
+                $('#HLevel').find("option[value='-1']").attr("selected", true);
+                sWhere = "";
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 05a832b..587e59c 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title>
+    <title>鐢ㄦ埛鍏宠仈渚涘簲鍟�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index e8291c9..f0d9bc8 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -842,7 +842,7 @@
                 if ($("#HRepairName").val() == '') {
                     layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
-                }
+                } 
                 //鏁板瓧姝e垯(鍖呭惈灏忔暟)
                 var reg = /^\d+(\.\d+)?$/;
                 if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 25775cf..c54f40c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -46,7 +46,7 @@
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
                             <div class="layui-col-xs4 layui-inline">
-                                <h2>宸ュ簭杩涚珯鎺ユ敹鍗�</h2>
+                                <h2>宸ュ簭鍑虹珯鎺ユ敹鍗�</h2>
                             </div>
                             <div class="layui-col-xs4 layui-inline">
                                 <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index b323663..ff4c1d3 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -30,7 +30,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">鍙戝竷鐘舵��</label>
+                                    <label class="layui-form-label">涓氬姟鐘舵��</label>
                                     <div class="layui-input-block">
                                         <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                             <option value="-1" selected="selected">鍏ㄩ儴</option>
@@ -730,7 +730,7 @@
                             data: { "Hmainid": hmainid, "HSupplierId": HSupplierId },
                             success: function (data1) {
                                 if (data1.Message.indexOf("鎴愬姛") > 0) {
-                                    layer.msg("鍙戝竷鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
+                                    layer.msg("鍒嗛厤鎴愬姛", { time: 3 * 1000, icon: 1 }, function () {
                                         var index = layer.getFrameIndex(window.name);
                                         //鍏抽棴褰撳墠frame
                                         layer.close(index);
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
new file mode 100644
index 0000000..0cbe137
--- /dev/null
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\346\224\266\346\226\231\345\205\245\345\272\223/Kf_ReciveBill_Fast.html"
@@ -0,0 +1,297 @@
+锘�<!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">
+</head>
+
+<body>
+    <div class="layui-fluid">
+        <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-tab" lay-filter="tab-SellOutBackBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1">鍗曟嵁淇℃伅</li>
+                            <li lay-id="2">鏄庣粏淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+                                            <input type="hidden" name="hmainid" id="hmainid" lay-verify="hmainid" autocomplete="off" class="layui-input">
+
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">渚涘簲鍟�</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HSupplierName" id="HSupplierName" lay-verify="HSupplierName" readonly autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4">
+                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
+                                        </div>
+                                        <div class="layui-col-xs8">
+                                            <input type="text" name="HDepartmentNmae" id="HDepartmentNmae" lay-verify="HDepartmentNmae" readonly autocomplete="off" class="layui-input">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table class="layui-hide" 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>
+                        </div>
+                    </div>
+                </form>
+            </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', 'laydate', 'table', 'element'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
+
+            //琛ㄥご鍒濆鍖栬祴鍊硷紙鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇 榛樿浠撳簱銆侀儴闂ㄣ�侀獙鏀躲�佷繚绠°�侀噾铦剁敤鎴凤級 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();
+
+            //鑾峰彇鍙傛暟
+            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;
+            }
+            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);
+            //            //$("#HKeeperID").val(d.data[0].HKeeperID);
+            //            //$("#HSecManagerID").val(d.data[0].HSecManagerID);
+            //            //$("#HDeptID").val(d.data[0].HDeptID);
+            //            //$("#HBarCode").val(d.data[0].HBarCode);
+            //            //$("#HQty").val(d.data[0].HQty);
+            //            RoadSup();
+            //        }
+            //    })
+            //}
+            //function RoadSup()//鏍规嵁婧愬崟绫诲瀷鍙婃簮鍗曞彿 鍔犺浇瀹㈡埛
+            //{
+            //    //var sInterID = $("#HInterID").val()
+            //    var HSourceBillNo = $('#HSourceBillNo').val()
+            //    var sInterID = $("#HInterID").val()
+            //    var sBillNo = $("#HBillNo").val()
+            //    var HSourceBillType = $("#HBillType").val()
+            //    //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁    new
+            //    if (HSourceBillNo == "" || sInterID <= 0) {
+            //        layer.msg($('#HSourceBillNo').val(), { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+            //        return;
+            //    }
+            //    else {
+            //        $.ajax({
+            //            url: GetWEBURL() + "/SellOutBack/get_GetXs_SeOutStockBackBillList",
+            //            type: "GET",
+            //            data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+            //            success: function (result) {
+            //                if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+            //                    $("#HSupID").val(result.data[0].HSupID);
+            //                    $("#HSupName").val(result.data[0].HSupName);
+            //                    $("#HDeptID").val(result.data[0].HDeptID);
+            //                    $("#HDeptName").val(result.data[0].HDeptName);
+            //                    sessionStorage["SourceFlag"] = true;
+            //                    element.tabChange('tab-SellOutBackBill', '2');
+            //                    layer.load(3);
+            //                }
+            //                else {
+            //                    layer.msg(result.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+            //                }
+            //                layer.closeAll("loading");
+            //            }
+            //        });
+            //    }
+            //}
+            function RoadBillSub(HBillno)//鍔犺浇鏁版嵁
+            {
+                $.ajax({
+                    url: GetWEBURL() + "/POStockInBillList/get_InfoByBillNo",
+                    type: "GET",
+                    data: { "HBillno": HBillno },
+                    success: function (result) {
+                        if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HSupplierName": data.渚涘簲鍟�
+                                , "HDepartmentNmae": data.閮ㄩ棬
+                                , "hmainid": data.hmainid
+                            });
+                        }
+                        else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+
+                        table.render({
+                            elem: '#wl-table'
+                            , url: GetWEBURL() + '/POStockInBillList/get_InfoByBillNo'
+                            , toolbar: '#toolbarDemo'
+                            , where: { "HBillno": HBillno }
+                            , cols: [[
+                                { type: 'radio' }
+                                , { field: '鏁伴噺', title: '鏁伴噺', width: 150 }
+                                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 150 }
+                                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+                                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150 }
+                                , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 }
+                                , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+                                , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+                                , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 150 }
+                            ]]
+                            , height: 500
+                            , done: function () {
+                                layer.closeAll("loading");
+                            }
+                        });
+
+                    },
+                    error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+                var a = 1;
+
+            }
+            //鍒ゆ柇鏄惁鏂板
+            /*RoadBillSub("");*/
+            //鍗曞彿鍥炶溅
+            $('#HSourceBillNo').on('keydown', function (event) {
+                //鎵潯鐮�
+                if (event.keyCode == 13) {
+                    if ($("#HSourceBillNo").val() == '') {
+                        layer.msg("鍗曟嵁鍙蜂负绌猴紝涓嶈兘鎵弿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    RoadBillSub($("#HSourceBillNo").val());
+                }
+            }
+            )
+
+            //鎻愪氦
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                var hmainid = $("#hmainid").val();
+                if ($("#hmainid").val() == '') {
+                    layer.msg("鍏堟壂鎻忓崟鎹紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/POStockInBill/confirm",
+                        async: true,
+                        data: { "hmainid": hmainid },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+                                sessionStorage["SourceFlag"] = false;
+                                layer.confirm("鏀舵枡" + data.Message + $("#HBillNo").val(), {
+                                    icon: 1,
+                                    skin: 'layui-layer-lan',
+                                    closeBtn: 0,
+                                    btn: ['纭'],
+                                    btn2: function () {
+                                        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+                                        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+                                        //window.location.reload();//鏂板
+                                        parent.location.href = "../../../views/index.html"
+                                    }//鍏抽棴
+                                }
+                                    , function () { parent.location.href = "../../../views/index.html"; }//鏂板
+                                );
+                            }
+                            else {
+                                //layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                            layer.closeAll("loading");
+                            layui.form.render();
+                        },
+                        error: function (err) {
+                            //layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't' });
+                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    });
+                return false;
+
+            });
+        });
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
index f8a53dd..4aafca2 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBackBill_Fast.html"
@@ -399,6 +399,7 @@
                         $("#HBillNo").val(d.data[0].HBillNo);
                     }
                 });
+                RoadBillSub("0");
             }
             else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
                 RoadBillMain(linterid);
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index 0673052..1dafbb5 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -401,12 +401,6 @@
 
         //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
 
-
-
-
-
-
-
         //鍒ゆ柇鏄惁鏂板
         if (linterid == null || linterid == 0) {
             //鑾峰彇鏈�澶у崟鎹彿 new

--
Gitblit v1.9.1