From eb65fe20debecd03d5a46b49f75658ed3ba9c496 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 11 十月 2021 16:44:38 +0800
Subject: [PATCH] 器具故障登记、维修记录案例找回

---
 WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html                |   10 
 WebTM/views/基础资料/公用基础资料/Gy_EquipMent_Edit.html               |  251 ++--
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html  |   10 
 WebTM/views/模治具管理/模治具管理/Sc_MouldConkBookBillList.html        |  479 ++++----
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user            |   90 
 WebTM/views/grf/器具分步式调出单.grf                                 |    2 
 WebTM/views/基础资料/公用基础资料/Gy_EquipMent.html                    |  109 +
 WebTM/views/模治具管理/模治具管理/Sc_MouldRepairCheckBillList.html     |  521 ++++----
 WebTM/views/grf/器具领用退库单.grf                                  |    2 
 WebTM/views/grf/器具领用出库单.grf                                  |    2 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html          |   10 
 WebTM/views/grf/器具分步式调入单.grf                                 |    2 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldRepairCheckBillList.html |  987 +++++++---------
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html               |    9 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html           |    9 
 WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html                |   10 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html    |   28 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldDotCheckBillList.html    |    2 
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillEdit.html           |   10 
 WebTM/views/index.html                                       |   50 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html           |   10 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldConkBookBillList.html    |  861 +++++++-------
 WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html               |   10 
 23 files changed, 1,764 insertions(+), 1,710 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index f4a28e6..1906da5 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-10-10T14:35:43.6802937Z;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-10-11T08:32:09.1274020Z;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>10/10/2021 22:35:36</publishTime>
+      <publishTime>10/11/2021 16:32:01</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>10/10/2021 22:35:36</publishTime>
+      <publishTime>10/11/2021 16:32:01</publishTime>
     </File>
     <File Include="layuiadmin/config.js">
       <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1062,10 +1062,10 @@
       <publishTime>10/04/2021 13:41:09</publishTime>
     </File>
     <File Include="views/grf/鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟.grf">
-      <publishTime>10/09/2021 23:41:20</publishTime>
+      <publishTime>10/11/2021 15:24:18</publishTime>
     </File>
     <File Include="views/grf/鍣ㄥ叿鍒嗘寮忚皟鍑哄崟.grf">
-      <publishTime>10/09/2021 23:41:20</publishTime>
+      <publishTime>10/11/2021 15:24:18</publishTime>
     </File>
     <File Include="views/grf/鍣ㄥ叿閲囪喘鍏ュ簱鍗�%28A4绾�%29.grf">
       <publishTime>10/04/2021 13:41:09</publishTime>
@@ -1074,10 +1074,10 @@
       <publishTime>10/04/2021 13:41:09</publishTime>
     </File>
     <File Include="views/grf/鍣ㄥ叿棰嗙敤鍑哄簱鍗�.grf">
-      <publishTime>10/10/2021 22:34:08</publishTime>
+      <publishTime>10/11/2021 15:24:18</publishTime>
     </File>
     <File Include="views/grf/鍣ㄥ叿棰嗙敤閫�搴撳崟.grf">
-      <publishTime>10/10/2021 22:34:10</publishTime>
+      <publishTime>10/11/2021 15:24:18</publishTime>
     </File>
     <File Include="views/grf/瀹瑰櫒閲囪喘鍏ュ簱.grf">
       <publishTime>10/06/2021 08:19:20</publishTime>
@@ -1110,7 +1110,7 @@
       <publishTime>07/07/2021 16:04:21</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>10/08/2021 19:44:41</publishTime>
+      <publishTime>10/11/2021 15:52:49</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
       <publishTime>07/17/2021 23:58:57</publishTime>
@@ -1458,22 +1458,22 @@
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>08/24/2021 19:28:41</publishTime>
+      <publishTime>10/11/2021 16:10:03</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>08/20/2021 15:10:21</publishTime>
+      <publishTime>10/11/2021 16:31:48</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>08/24/2021 19:28:41</publishTime>
+      <publishTime>10/11/2021 16:10:03</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>08/20/2021 15:10:21</publishTime>
+      <publishTime>10/11/2021 16:31:48</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>08/24/2021 19:28:41</publishTime>
+      <publishTime>10/11/2021 16:10:03</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>08/20/2021 15:10:21</publishTime>
+      <publishTime>10/11/2021 16:31:48</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
       <publishTime>09/10/2021 09:46:57</publishTime>
@@ -1614,7 +1614,7 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:16:45</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html">
       <publishTime>09/10/2021 09:46:57</publishTime>
@@ -1677,22 +1677,22 @@
       <publishTime>09/10/2021 09:46:57</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:16:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:16:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:16:08</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
       <publishTime>09/10/2021 09:46:57</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:15:34</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
-      <publishTime>09/10/2021 09:46:57</publishTime>
+      <publishTime>10/11/2021 15:15:34</publishTime>
     </File>
     <File Include="views/宸ヨ祫绠$悊/Gy_DuSubsidyItemBillEdit.html">
       <publishTime>09/30/2021 15:58:39</publishTime>
@@ -1806,7 +1806,7 @@
       <publishTime>10/08/2021 19:44:41</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
-      <publishTime>10/08/2021 19:44:41</publishTime>
+      <publishTime>10/11/2021 10:11:59</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">
       <publishTime>10/08/2021 19:44:41</publishTime>
@@ -1881,16 +1881,16 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 14:37:32</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/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 14:26:33</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 10:23:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
       <publishTime>10/09/2021 23:48:39</publishTime>
@@ -1902,7 +1902,7 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 13:57:54</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1971,16 +1971,16 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 14:37:32</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/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 14:26:33</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 10:23:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
       <publishTime>10/09/2021 23:48:39</publishTime>
@@ -1992,7 +1992,7 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 13:57:54</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2016,7 +2016,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 14:28:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">
       <publishTime>10/09/2021 23:48:39</publishTime>
@@ -2028,7 +2028,7 @@
       <publishTime>10/09/2021 23:48:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 10:15:21</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
       <publishTime>10/05/2021 18:09:16</publishTime>
@@ -2043,7 +2043,7 @@
       <publishTime>07/02/2021 16:55:33</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">
-      <publishTime>10/09/2021 23:48:39</publishTime>
+      <publishTime>10/11/2021 13:43:48</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2259,10 +2259,10 @@
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>09/08/2021 08:34:08</publishTime>
+      <publishTime>10/11/2021 14:53:37</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>07/12/2021 13:18:34</publishTime>
+      <publishTime>10/11/2021 14:54:39</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -2277,7 +2277,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:50:18</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
@@ -2286,13 +2286,13 @@
       <publishTime>06/29/2021 11:09:03</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:49:10</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>09/16/2021 22:14:25</publishTime>
+      <publishTime>10/11/2021 14:44:07</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
@@ -2301,7 +2301,7 @@
       <publishTime>06/29/2021 11:09:29</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:41:45</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
@@ -2358,10 +2358,10 @@
       <publishTime>09/08/2021 08:34:08</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>09/08/2021 08:34:08</publishTime>
+      <publishTime>10/11/2021 14:53:37</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>07/12/2021 13:18:34</publishTime>
+      <publishTime>10/11/2021 14:54:39</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
       <publishTime>09/08/2021 08:34:08</publishTime>
@@ -2373,25 +2373,25 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:50: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>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:49:10</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>09/16/2021 22:14:25</publishTime>
+      <publishTime>10/11/2021 14:44:07</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>09/13/2021 18:04:58</publishTime>
+      <publishTime>10/11/2021 14:41:45</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
       <publishTime>09/13/2021 18:04:58</publishTime>
@@ -2718,7 +2718,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>10/10/2021 22:35:40</publishTime>
+      <publishTime>10/11/2021 16:32:06</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git "a/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225.grf" "b/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225.grf"
index f4a62d6..5a9b6de 100644
--- "a/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225.grf"
+++ "b/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225.grf"
@@ -276,7 +276,7 @@
 						Charset=134
 					End
 					TextAlign=MiddleCenter
-					Text='鍥涚淮灏斾父浜曪紙骞垮窞锛夋苯杞﹂浂閮ㄤ欢鏈夐檺鍏徃'
+					Text='#鎺ユ敹鍗曚綅#'
 				End
 				Item
 					Type=MemoBox
diff --git "a/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225.grf" "b/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225.grf"
index 1d82afb..ab17a6d 100644
--- "a/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225.grf"
+++ "b/WebTM/views/grf/\345\231\250\345\205\267\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225.grf"
@@ -276,7 +276,7 @@
 						Charset=134
 					End
 					TextAlign=MiddleCenter
-					Text='鍥涚淮灏斾父浜曪紙骞垮窞锛夋苯杞﹂浂閮ㄤ欢鏈夐檺鍏徃'
+					Text='#鍙戝嚭鍗曚綅#'
 				End
 				Item
 					Type=MemoBox
diff --git "a/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\345\207\272\345\272\223\345\215\225.grf" "b/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\345\207\272\345\272\223\345\215\225.grf"
index dce9bdd..e1582c7 100644
--- "a/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\345\207\272\345\272\223\345\215\225.grf"
+++ "b/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\345\207\272\345\272\223\345\215\225.grf"
@@ -276,7 +276,7 @@
 						Charset=134
 					End
 					TextAlign=MiddleCenter
-					Text='鍥涚淮灏斾父浜曪紙骞垮窞锛夋苯杞﹂浂閮ㄤ欢鏈夐檺鍏徃'
+					Text='#鍙戝嚭鍗曚綅#'
 				End
 				Item
 					Type=MemoBox
diff --git "a/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\351\200\200\345\272\223\345\215\225.grf" "b/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\351\200\200\345\272\223\345\215\225.grf"
index 486e6af..d60e674 100644
--- "a/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\351\200\200\345\272\223\345\215\225.grf"
+++ "b/WebTM/views/grf/\345\231\250\345\205\267\351\242\206\347\224\250\351\200\200\345\272\223\345\215\225.grf"
@@ -273,7 +273,7 @@
 						Charset=134
 					End
 					TextAlign=MiddleCenter
-					Text='鍥涚淮灏斾父浜曪紙骞垮窞锛夋苯杞﹂浂閮ㄤ欢鏈夐檺鍏徃'
+					Text='#鎺ユ敹鍗曚綅#'
 				End
 				Item
 					Type=MemoBox
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index fbbc168..23fbba9 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -467,27 +467,27 @@
                                     <a>浠撳偍绠$悊</a>
                                     <dl class="layui-nav-child">
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">鍣ㄥ叿閲囪喘鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html ">鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBill.html">鍣ㄥ叿澶勭悊鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">鍣ㄥ叿澶勭悊鍑哄簱鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">鍣ㄥ叿澶勭悊鍑哄簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillEdit.html">鍣ㄥ叿鏀瑰埗鐢宠鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairChangeBillList.html">鍣ㄥ叿鏀瑰埗鐢宠鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillEdit.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillEdit.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">鍣ㄥ叿鏀瑰埗鍑哄簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBill.html">鍣ㄥ叿鐩存帴璋冩嫧鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">鍣ㄥ叿鐩存帴璋冩嫧鍗曟嵁缁存姢</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟鎹淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍏ュ崟缁存姢</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟鎹淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">鍣ㄥ叿鍒嗘寮忚皟鍑哄崟缁存姢</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">鍣ㄥ叿鍏朵粬鍏ュ簱鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">鍣ㄥ叿鍏朵粬鍑哄簱鍗�</a></dd>
@@ -504,14 +504,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -551,14 +551,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -571,7 +571,7 @@
                                         <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_EqpMaintenanceBillList.html">璁惧缁翠慨璁板綍鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗曠淮鎶ull</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EqpRepairCheckBillList.html">璁惧缁翠慨楠屾敹鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </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/Gy_EquipMent.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_EquipMent.html"
index b7f9fb8..fbc5f51 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_EquipMent.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_EquipMent.html"
@@ -41,7 +41,7 @@
                                 <div style="padding: 10px;">
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
@@ -128,6 +128,11 @@
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery();
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btnAdd)', function (data) {
+                set_AddBill();
             });
 
             //淇敼鎸夐挳
@@ -255,53 +260,93 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
 
+            //鏂板
+            function set_AddBill() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鍣ㄥ叿缁翠慨楠屾敹鍗�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: 'Gy_EquipMent_Edit.html.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
             //淇敼
             function set_ShowBill(data) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '璁惧鍩虹璧勬枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_EquipMent_Edit.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
-                    , resize: false
-                })
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '璁惧鍩虹璧勬枡'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: 'Gy_EquipMent_Edit.html?.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(obj) {
                 var ModRightNameDelete = 'Gy_EquipMent_Delete'
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
 
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        var checkStatus = table.checkStatus('mainTable');
-                        var layEvent = checkStatus.event;
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         $.ajax({
-                            //url: GetWEBURL() + '/Gy_EquipMent/Delete_Json',
-                            url: "http://localhost:12761/Gy_EquipMent/Delete_Json",
                             type: "GET",
-                            //async: true,
-                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                            url: GetWEBURL() + '/Gy_EquipMent/Delete_Json', //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HInterID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
                             success: function (result) {
                                 if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 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 });
                                 }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                             }
-                        })
-                        layer.close(index); //鍏抽棴寮瑰眰
-                    }
-                });
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
             }
 
             //绂佺敤
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_EquipMent_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html"
index b565a13..a9efb3a 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_EquipMent_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent_Edit.html"
@@ -13,6 +13,8 @@
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
 </head>
 <body>
@@ -21,27 +23,28 @@
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <div style="padding: 10px;">
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
                             <div class="layui-inline">
                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input"value="瀹佹尝鍥涚淮灏�">
+                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
                                     <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
+                                    <input id="HItemID" name="HItemID" type="hidden" />
                                 </div>
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
                             </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
                                 <div class="layui-input-inline">
-                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input"value="瀹佹尝鍥涚淮灏�">
+                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                 </div>
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
@@ -60,136 +63,130 @@
                             </div>
                         </div>
                         <div class="layui-row">
-                            <div class="layui-inline"style="width: 56%;">
+                            <div class="layui-inline" style="width: 56%;">
                                 <label class="layui-form-label">鍔╄鐮�</label>
-                                <div class="layui-input-inline"style="width: 56%;">
+                                <div class="layui-input-inline" style="width: 56%;">
                                     <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
                     </div>
-                        <!--<div class="title">鍩烘湰淇℃伅</div>-->
-                        <div class="layui-tab" lay-filter="tab-POStockInBill">
-                            <ul class="layui-tab-title" lay-filter="tab-all">
-                                <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                                <li lay-id="2" style="padding:1px;">鍏朵粬</li>
-                            </ul>
-                            <div class="layui-tab-content">
-                                <!--鍩烘湰淇℃伅-->
-                                <div class="layui-tab-item layui-show">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒堕�犺垂鐢�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HMadeMoney" id="HMadeMoney" lay-verify="HMadeMoney" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鏍囧噯宸ヨ祫</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HStdPay" id="HStdPay" lay-verify="HStdPay" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">澶囨敞</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                    <!--<div class="title">鍩烘湰淇℃伅</div>-->
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒堕�犺垂鐢�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HMadeMoney" id="HMadeMoney" lay-verify="HMadeMoney" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                 </div>
-                             </div>
-                                <!--鍏朵粬淇℃伅-->
-                                <div class="layui-tab-item ">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鏍囧噯宸ヨ祫</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HStdPay" id="HStdPay" lay-verify="HStdPay" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item ">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                            <!--闅愯棌瀛楁-->
-                            <input type="hidden" name="lngBillKey" id="lngBillKey">
-                            <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-                            <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
-</form>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+                    <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+                </form>
             </div>
         </div>
     </div>
     <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 = 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]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-        var HType = params[params[1]];    //鍗曟嵁鐘舵��
-        var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -204,14 +201,15 @@
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
-            //鍒ゆ柇鏂板杩樻槸缂栬緫
-            if (HType == "Modify") {
-                //缂栬緫
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
                 set_ShowBill();
             }
             else {
-                //鏂板
-                set_AddNew();
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
             //#endregion
@@ -236,9 +234,14 @@
 
             //閫�鍑�
             form.on('submit(Cancel)', function () {
-                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
-                });
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
             //閫夋嫨楠屾敹
@@ -272,15 +275,13 @@
             //#region 鏈〉闈㈠姞杞芥墍鏈夋柟娉�
 
             //鏂板
-            function set_AddNew()
-            {
+            function set_AddNew() {
                 $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
                 get_MAXNum();
             }
 
             //鑾峰彇鏈�澶D
-            function get_MAXNum()
-            {
+            function get_MAXNum() {
                 //鑾峰彇鏈�澶у熀纭�璧勬枡ID
                 $.ajax({
                     url: GetWEBURL() + "/Gy_EquipMent/GetMAXBillID",
@@ -288,14 +289,14 @@
                     data: {},
                     success: function (d) {
                         //console.log(d.data);
-                        $("#HInterID").val(d.data[0].hitemid);
+                        $("#HItemID").val(d.data[0].hitemid);
                     }
                 });
             }
 
             //缂栬緫
-            function set_ShowBill()
-            {
+            function set_ShowBill() {
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Gy_EquipMent/xg",
                     type: "GET",
@@ -325,8 +326,7 @@
             }
 
             //楠岃瘉
-            function AllowLoadData(data)
-            {
+            function AllowLoadData(data) {
                 var HCreateOrg = $("#HCreateOrg").val();
                 if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
 
@@ -372,8 +372,7 @@
             }
 
             //淇濆瓨璇锋眰
-            function set_SaveUrl(data)
-            {
+            function set_SaveUrl(data) {
                 var ModRightNameAdd = 'Gy_EquipMent_Edit';
                 var user = sessionStorage["HUserName"];
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index 5d31f9a..2090fd7 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -190,8 +190,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
             //閫夋嫨榛樿閮ㄩ棬
             form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.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_Edit.html"
index f438e97..d217c3e 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_Edit.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_Edit.html"
@@ -524,8 +524,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function () {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
             //瀹℃牳
             form.on('submit(Check)', function () {
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_Edit.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_Edit.html"
index ad7a9c8..3aaf90c 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_Edit.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_Edit.html"
@@ -632,8 +632,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
             ////閲嶇疆
             //form.on('submit(btnReSearch)', function (data) {
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 1cc0dbd..a600a8b 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"
@@ -600,8 +600,14 @@
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
             form.on('submit(Cancel)', function () {
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_Add_MouldConkBookBillList.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_Add_MouldConkBookBillList.html"
index c873a61..8f1ee55 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_Add_MouldConkBookBillList.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_Add_MouldConkBookBillList.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">
@@ -37,7 +37,7 @@
                                 <li class="layui-this">鍩烘湰淇℃伅</li>-->
                                 <!--<li>鍏朵粬淇℃伅</li>-->
                                 <!--</ul>-->
-                                <h1 style="text-align:center;"><b>鍣ㄥ叿鏁呴殰鐧昏琛�</b></h1>
+                                <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">
@@ -61,7 +61,7 @@
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <label class="layui-form-label">浜у搧鍣ㄥ叿</label>
+                                                <label class="layui-form-label">浜у搧妯″叿</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HName" id="HName" class="layui-input" value="" style="float:left;width:150px;">
                                                     <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
@@ -91,7 +91,7 @@
                                                     <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                     </button>
-                                   
+
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -106,7 +106,7 @@
                                                     <input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" timeFormat="yyyy-MM-dd">
                                                 </div>
                                             </div>
-                                          
+
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
@@ -172,22 +172,17 @@
     <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>//鑾峰彇鍙傛暟
-        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;
+    <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]];//婧愬崟绫诲瀷
         }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
 
 
         layui.config({
@@ -195,6 +190,8 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region  鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -202,302 +199,55 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            var sBillType = "3807";
+            var TabRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region  杩涘叆椤甸潰鍒濆鍖�
 
-            });
-            laydate.render({
-                elem: '#HConkBeginDate'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-            });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
-                    , { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠g爜', edit: 'text', event: "HConkReasonCode"}
-                    , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text'}
-                    , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text'}
-                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
-                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode"}
-                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text'}
-                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text'}
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo'}
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0,"HManagerCode":"", "HManagerName": "", "HRemark": "" }];
-                table.render(option);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
             }
             else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
-                $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
-                    type: "GET",
-                    //data: { "sqlWhere": "and HInterID=" + hID },
-                    data: { "sqlWhere": "and hmainid=" + hID },
-                    success: function (result) {
-                        //console.log('gouba' + result);
-                        if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
-
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index0);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
 
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛�
+
             //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HConkReasonID": 0, "HConkReasonCode": "", "HConkReasonName": "", "HConkExplanation": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+                var NewRow = TabRow;
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //澧炲姞涓�琛�
+                    case 'btn-AddLine': set_AddLine(NewRow);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': set_CopyLine(data);
                         break;
                 }
             });
             //琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            //obj.del();
-                            //layer.close(index);
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
-                            layer.close(index);
-                        }
-                    });
-                }
-               
-               
-                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
-                    if (event.key == "F7") {
-                        if (obj.event === 'HConkReasonCode')  //鏁呴殰鍘熷洜浠g爜
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '鏁呴殰鍘熷洜鍒楄〃',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/FaultReasonInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
-
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HConkReasonID: checkStatus.data[0].HItemID,
-                                        HConkReasonCode: checkStatus.data[0].HNumber,
-                                        HConkReasonName: checkStatus.data[0].HName,
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-
-                        if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
-                        {
-                            //椤甸潰灞�-鑷畾涔�
-                            layer.open({
-                                type: 2,
-                                skin: 'layui-layer-rim', //鍔犱笂杈规
-                                title: '璐熻矗浜轰俊鎭垪琛�',
-                                closeBtn: 1,
-                                shift: 2,
-                                area: ['80%', '80%'],
-                                maxmin: true,
-                                content: ['../../PublicPage/UserInformation.html', 'yes'],
-                                btn: ['纭畾', '鍙栨秷']
-                                , btn1: function (index, layero) {
-
-                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                                    if (checkStatus.data.length === 0) {
-                                        return layer.msg('璇烽�夋嫨鏁版嵁');
-                                    }
-
-                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
-                                    obj.update({
-                                        HManagerID: checkStatus.data[0].HItemID,
-                                        HManagerCode: checkStatus.data[0].HNumber,
-                                        HManagerName: checkStatus.data[0].HName
-                                    });
-
-                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                                }
-                                , btn2: function (index, layero) {
-                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                                },
-                                end: function () {
-
-                                }
-                            });
-                        }
-
-                        obj.event = "";
-                        return false;
-
-                    }
-                })
-
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
 
             });
-
-
-
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
-                    type: "GET",
-                    data: {
-                        "HID": hID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldConkBookBillList_Edit[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": formatDate(data.鏃ユ湡)
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HMouldID": data.HMouldID        //妯″叿ID
-                                , "HName": data.浜у搧妯″叿      //妯″叿鍚嶇О
-                                , "HConkTypeID": data.HConkTypeID  //鏁呴殰绫诲埆ID
-                                , "HConkTypeName": data.鏁呴殰绫诲埆  //鏁呴殰绫诲埆鍚嶇О
-                                , "HEmpID": data.HEmpID            //鍙戠幇浜篒D
-                                , "HEmpName": data.鍙戠幇浜�            //鍙戠幇浜哄悕绉�
-                                , "HConkBeginDate": formatDate(data.鏁呴殰鍙戠敓鏃ユ湡)
-                                , "HEndDate": formatDate(data.瑕佹眰瀹屽杽鏃ユ湡)
-                                , "HManagerID": data.HManagerID    //璐熻矗浜篒D
-                                , "HManagerName": data.璐熻矗浜�    //璐熻矗浜哄悕绉�
-                                , "HDeptID": data.HDeptID        //浣跨敤閮ㄩ棬ID
-                                , "HDeptName": data.浣跨敤閮ㄩ棬     //浣跨敤閮ㄩ棬
-                                , "HExplanation": data.鎽樿
-                                , "HRemark": data.澶囨敞
-                            });
-
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3815' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HConkBeginDate").val(shijian);
-                        $("#HEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
 
             //鎴愬搧妯″叿寮圭獥
             form.on('submit(ProductModulList)', function () {
@@ -505,7 +255,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鎴愬搧鍣ㄥ叿鍒楄〃',
+                    title: '鎴愬搧妯″叿鍒楄〃',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
@@ -575,7 +325,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅鍙戠幇浜哄脊绐� 
+            //琛ㄥご淇℃伅鍙戠幇浜哄脊绐�
             form.on('submit(HEmpList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -613,7 +363,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅璐熻矗浜哄脊绐� 
+            //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
             form.on('submit(HManagerList)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -651,7 +401,7 @@
                 });
             });
 
-            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥 
+            //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
             form.on('submit(Department)', function () {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -689,24 +439,183 @@
                 });
             });
 
-
-
-
+            //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
-           
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                //瀵规暟鎹繘琛岄獙璇�
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
 
+                                    f_alert(data.Message);
+                                    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(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
+            //#endregion
 
+            //#region  褰撳墠椤甸〉闈㈡墍鏈夋柟娉�
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HConkBeginDate'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                });
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
+                    , { field: 'HConkReasonCode', title: '鏁呴殰鍘熷洜浠g爜', edit: 'text', event: "HConkReasonCode" }
+                    , { field: 'HConkReasonName', title: '鏁呴殰鍘熷洜', edit: 'text' }
+                    , { field: 'HConkExplanation', title: '鏁呴殰鍘熷洜鎻忚堪', edit: 'text' }
+                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HConkBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldConkBookBill/Sb_MouldConkBookBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldConkBookBillList_Edit[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HMouldID": data.HMouldID        //妯″叿ID
+                                , "HName": data.浜у搧妯″叿      //妯″叿鍚嶇О
+                                , "HConkTypeID": data.HConkTypeID  //鏁呴殰绫诲埆ID
+                                , "HConkTypeName": data.鏁呴殰绫诲埆  //鏁呴殰绫诲埆鍚嶇О
+                                , "HEmpID": data.HEmpID            //鍙戠幇浜篒D
+                                , "HEmpName": data.鍙戠幇浜�            //鍙戠幇浜哄悕绉�
+                                , "HConkBeginDate": formatDate(data.鏁呴殰鍙戠敓鏃ユ湡)
+                                , "HEndDate": formatDate(data.瑕佹眰瀹屽杽鏃ユ湡)
+                                , "HManagerID": data.HManagerID    //璐熻矗浜篒D
+                                , "HManagerName": data.璐熻矗浜�    //璐熻矗浜哄悕绉�
+                                , "HDeptID": data.HDeptID        //浣跨敤閮ㄩ棬ID
+                                , "HDeptName": data.浣跨敤閮ㄩ棬     //浣跨敤閮ㄩ棬
+                                , "HExplanation": data.鎽樿
+                                , "HRemark": data.澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
             function formatDate(date) {
                 var d = new Date(date),
                     month = '' + (d.getMonth() + 1),
@@ -719,170 +628,228 @@
                 return [year, month, day].join('-');
             }
 
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
+            // 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldConkBookBill/Sb_MouldConkBookBillListProjectDetai',
+                    type: "GET",
+                    data: { "sqlWhere": "and hmainid=" + linterid },
+                    success: function (result) {
+                        //console.log('gouba' + result);
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
 
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sc_MouldConkBookBill/SaveGetMouldConkBookBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        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 {
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
 
-                                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);
+            //琛屽唴鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                var rowIndex = $(obj.tr).attr("data-index");
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        console.log("绱㈠紩涓�:" + rowIndex);
+                        if (rowIndex === '0') {
+                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+                        } else {
+                            //obj.del();
+                            //layer.close(index);
+                            var oldData = table.cache["mainTable"];
+                            oldData.splice(obj.tr.data('index'), 1);
+                            table.reload('mainTable', { data: oldData });
+                            layer.close(index);
                         }
                     });
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
+                }
             }
 
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
+            //琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HConkReasonCode')  //缁翠慨浠g爜
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鏁呴殰鍘熷洜鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/FaultReasonInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
 
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HConkReasonID: checkStatus.data[0].HItemID,
+                                        HConkReasonCode: checkStatus.data[0].HNumber,
+                                        HConkReasonName: checkStatus.data[0].HName,
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HManagerCode')  //璐熻矗浜轰俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐熻矗浜轰俊鎭垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['80%', '80%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UserInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HManagerID: checkStatus.data[0].HItemID,
+                                        HManagerCode: checkStatus.data[0].HNumber,
+                                        HManagerName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            }
+
+            //澧炲姞涓�琛�
+            function set_AddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+
+            //澶嶅埗涓�琛�
+            function set_CopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    //layer.alert(copyrow);
+                }
+            }
+
+            //#endregion
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        //杩斿洖鐗╂枡
-        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
-            $("#HMaterID").val(obj[0].HItemID);
-            $("#HMaterNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖宸ュ簭
-        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
-            $("#HProcName").val(obj[0].宸ュ簭);
-            $("#HProcID").val(obj[0].HItemID);
-            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
-        }
-        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-            $("#HDepName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖鍗曚綅
-        function GetHUnitNameValue(obj) {
-            $("#HUName").val(obj[0].HName);
-            $("#HUnitID").val(obj[0].HItemID);
-            $("#HUnitNumber").val(obj[0].HNumber);
-        }
 
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-        //    SQProcName = obj[0].宸ュ簭;
-        //    ProcID = obj[0].HItemID;
-        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
-        //    //$("#HProcID").val(obj[0].HItemID);
-        //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+        function AllowLoadData(sSubStr) {
+            if ($("#HMouldID").val() == '' && $("#HName").val() == '') {
+                layer.msg("鎴愬搧妯″叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HConkTypeID").val() == '' && $("#HConkTypeName").val() == '') {
+                layer.msg("鏁呴殰绫诲埆娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+            if ($("#HEmpID").val() == '' && $("#HEmpName").val() == '') {
+                layer.msg("鍙戠幇浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HManagerID").val() == '' && $("#HManagerName").val() == '') {
+                layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HDeptID").val() == '' && $("#HDeptName").val() == '') {
+                layer.msg("浣跨敤閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+
+            //鍒ゆ柇鐗╂枡鏄庣粏椤�
+            if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HRepairCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
                     }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                    if (sSubStr[i].HManagerCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    else {
+                        return true;
+                    }
                 }
             }
             else {
                 return true;
             }
-        }</script>
+        }
+    </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldDotCheckBillList.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_Add_MouldDotCheckBillList.html"
index 8469491..697a3b9 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_Add_MouldDotCheckBillList.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_Add_MouldDotCheckBillList.html"
@@ -143,7 +143,7 @@
         //鑾峰彇椤甸潰璺宠浆鍙傛暟
         var params = get_UrlVars();
         if (typeof (params[params[0]]) == "undefined") {
-            var OperationType = 0;//鎿嶄綔绫诲瀷 (鑿滃崟椤甸潰杩涘叆)
+            var OperationType = 1;//鎿嶄綔绫诲瀷 (鑿滃崟椤甸潰杩涘叆)
         } else {
             var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
             var linterid = params[params[1]];//婧愬崟id
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_Add_MouldRepairCheckBillList.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_Add_MouldRepairCheckBillList.html"
index a58b512..0753f06 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_Add_MouldRepairCheckBillList.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_Add_MouldRepairCheckBillList.html"
@@ -163,29 +163,26 @@
     <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>//鑾峰彇鍙傛暟
-        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;
+    <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]];//婧愬崟绫诲瀷
         }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
 
         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
@@ -194,59 +191,381 @@
                 , laydate = layui.laydate
                 , element = layui.element;
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //鏌ヨ鏉′欢
+            var option = [];
+            var sBillType = "3817";
+            var TabRow = { "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": "  ", "HRepairCheckContent": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HRemark": "  " }
+            //#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 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            // 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var rowid = 0;
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable'];
+                var NewRow = TabRow;
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
+                        break;
+                }
             });
-            laydate.render({
-                elem: '#HRepairBeginDate'
+
+            //琛屽唴浜嬩欢
+            table.on('tool(mainTable)', function (obj) {
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
-            laydate.render({
-                elem: '#HRepairEndDate'
+
+            //鎴愬搧妯″叿寮圭獥
+            form.on('submit(ProductModulList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鎴愬搧鍣ㄥ叿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MouldInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HName").val(checkStatus.data[0].HName);
+                        $("#HMouldID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
             });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
+
+            //琛ㄥご淇℃伅楠屾敹浜哄脊绐�
+            form.on('submit(HEmpList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").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(Department)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご淇℃伅璐熻矗浜哄脊绐�
+            form.on('submit(HManagerList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜哄憳鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UserInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HManagerName").val(checkStatus.data[0].HName);
+                        $("#HManagerID").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(Saver)', function (data) {
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            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 () {
+                if (linterid == undefined) {
+                    Pub_Close(2);
+                }
+                else {
+                    Pub_Close(1);
+                }
+            });
+          
+            //#endregion
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栬〃鍗�
+            function set_InitFrom() {
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HCheckBeginDate'
+                });
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                Table(); 
+            }
+            //鍒濆鍖栦繚鍏婚」鍒楄〃
+            function Table() {
+                //琛ㄥご
+                columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HRepairCheckID', title: 'HRepairCheckID', edit: 'text', hide: true }
-                    , { field: 'HRepairCheckCode', title: '楠屾敹椤圭洰浠g爜', edit: 'text', event: "HRepairCheckCode"}
-                    , { field: 'HRepairCheckName', title: '楠屾敹椤圭洰', edit: 'text'}
+                    , { field: 'HRepairCheckCode', title: '楠屾敹椤圭洰浠g爜', edit: 'text', event: "HRepairCheckCode" }
+                    , { field: 'HRepairCheckName', title: '楠屾敹椤圭洰', edit: 'text' }
                     , { field: 'HRepairCheckContent', title: '楠屾敹鍐呭', edit: 'text' }
-                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true}
-                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode"}
+                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
                     , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": "  ", "HRepairCheckContent": "   ", "HManagerID": 0,"HManagerCode":"", "HManagerName": "  ", "HRemark": "  " }];
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+                    }
+                };
+            }
+            
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [TabRow];
                 table.render(option);
             }
-            else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
+            //鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HCheckBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_EditFromGrid(linterid) {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldRepairCheckBillList_Edit[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HMouldID": data.HMouldID            //妯″叿ID
+                                , "HName": data.浜у搧妯″叿               //妯″叿鍚嶇О
+                                , "HCheckResult": data.楠屾敹缁撹
+                                , "HEmpID": data.HEmpID                //楠屾敹浜篒D
+                                , "HEmpName": data.楠屾敹浜�              //楠屾敹浜哄悕绉�
+                                , "HCheckBeginDate": formatDate(data.缁翠慨鏃ユ湡)
+                                , "HDeptID": data.HDeptID              //楠屾敹閮ㄩ棬ID
+                                , "HDeptName": data.楠屾敹閮ㄩ棬             //楠屾敹閮ㄩ棬
+                                , "HManagerID": data.HManagerID          //璐熻矗浜篒D
+                                , "HManagerName": data.璐熻矗浜�            //璐熻矗浜篒D
+                                , "HExplanation": data.鎽樿
+                                , "HRemark": data.澶囨敞
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            //缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + 'Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListProjectDetai',
                     type: "GET",
-                    //data: { "sqlWhere": "and HInterID=" + hID }, 
-                    data: { "sqlWhere": "and hmainid=" + hID },
+                    //data: { "sqlWhere": "and HInterID=" + hID },
+                    data: { "sqlWhere": "and hmainid=" + linterid },
                     success: function (result) {
                         //console.log('gouba' + result);
                         if (result.count == 1) {
@@ -261,48 +580,48 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-
             }
 
+            //鏃ユ湡鏍煎紡鍖�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
 
-            //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
-            table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;;
-                var AddRow = table.cache['mainTable'];
-                var NewRow = { "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": "  ", "HRepairCheckContent": "   ", "HManagerID": 0,"HManagerCode":"", "HManagerName": "  ", "HRemark": "  " };
-                switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
-                        break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
-                        break;
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option1.data = table.cache["mainTable"];
+                table.render(option);
+            }
+
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
                 }
-            });
-            //琛屽唴浜嬩欢
-            table.on('tool(mainTable)', function (obj) {
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+          
+            // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
                 if (obj.event === 'del') {
@@ -320,7 +639,10 @@
                         }
                     });
                 }
-               
+            }
+          
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
                         if (obj.event === 'HRepairCheckCode')  //楠屾敹椤圭洰浠g爜
@@ -404,464 +726,63 @@
                                 }
                             });
                         }
-
                         obj.event = "";
                         return false;
 
                     }
                 })
-
-            });
-
-
-
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "Sc_MouldRepairCheckBill/Sb_MouldRepairCheckBillListCheckDetai",
-                    type: "GET",
-                    data: {
-                        "HID": hID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldRepairCheckBillList_Edit[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": formatDate(data.鏃ユ湡)
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HMouldID": data.HMouldID            //妯″叿ID
-                                , "HName": data.浜у搧妯″叿               //妯″叿鍚嶇О
-                                , "HCheckResult": data.楠屾敹缁撹
-                                , "HEmpID": data.HEmpID                //楠屾敹浜篒D
-                                , "HEmpName": data.楠屾敹浜�              //楠屾敹浜哄悕绉�
-                                , "HCheckBeginDate": formatDate(data.缁翠慨鏃ユ湡)
-                                , "HDeptID": data.HDeptID              //楠屾敹閮ㄩ棬ID
-                                , "HDeptName": data.楠屾敹閮ㄩ棬             //楠屾敹閮ㄩ棬
-                                , "HManagerID": data.HManagerID          //璐熻矗浜篒D
-                                , "HManagerName": data.璐熻矗浜�            //璐熻矗浜篒D
-                                , "HExplanation": data.鎽樿
-                                , "HRemark": data.澶囨敞
-                            });
-
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
             }
 
+            //闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {
+                if ($("#HMouldID").val() == '') {
+                    layer.msg("浜у搧妯″叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HEmpID").val() == '') {
+                    layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HDeptID").val() == '') {
+                    layer.msg("楠屾敹閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HManagerID").val() == '') {
+                    layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
 
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3817' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HCheckBeginDate").val(shijian);
-                        $("#HInterID").val(0);
+                //鍒ゆ柇鏄庣粏椤�
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
+                    layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HRepairCheckCode == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,楠屾敹椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        if (sSubStr[i].HManagerCode == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return false;
+                        }
+                        else {
+                            return true;
+                        }
                     }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+                }
             }
 
-            //鎴愬搧妯″叿寮圭獥
-            form.on('submit(ProductModulList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鎴愬搧鍣ㄥ叿鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/MouldInformation.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('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HName").val(checkStatus.data[0].HName);
-                        $("#HMouldID").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(HEmpList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浜哄憳鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HEmpName").val(checkStatus.data[0].HName);
-                        $("#HEmpID").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(Department)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '閮ㄩ棬鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HDeptName").val(checkStatus.data[0].HName);
-                        $("#HDeptID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-            //琛ㄥご淇℃伅璐熻矗浜哄脊绐� 
-            form.on('submit(HManagerList)', function () {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '浜哄憳鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['80%', '80%'],
-                    maxmin: true,
-                    content: ['../../PublicPage/UserInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
-                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
-                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
-                        if (checkStatus.data.length === 0) {
-                            return layer.msg('璇烽�夋嫨鏁版嵁');
-                        }
-                        $("#HManagerName").val(checkStatus.data[0].HName);
-                        $("#HManagerID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                    }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    },
-                    success: function (layero, index) {
-
-                    }
-                });
-            });
-
-
-
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
-
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-            function formatDate(date) {
-                var d = new Date(date),
-                    month = '' + (d.getMonth() + 1),
-                    day = '' + d.getDate(),
-                    year = d.getFullYear();
-
-                if (month.length < 2) month = '0' + month;
-                if (day.length < 2) day = '0' + day;
-
-                return [year, month, day].join('-');
-            }
-
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sc_MouldRepairCheckBill/SaveGetMouldRepairCheckBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon:1 }, function () {
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                            }
-                            layer.closeAll("loading");
-                        },
-                        error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
-                        }
-                    });
-            });
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
             }
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
+            //#endregion
 
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        //杩斿洖鐗╂枡
-        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
-            $("#HMaterID").val(obj[0].HItemID);
-            $("#HMaterNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖宸ュ簭
-        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
-            $("#HProcName").val(obj[0].宸ュ簭);
-            $("#HProcID").val(obj[0].HItemID);
-            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
-        }
-        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-            $("#HDepName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖鍗曚綅
-        function GetHUnitNameValue(obj) {
-            $("#HUName").val(obj[0].HName);
-            $("#HUnitID").val(obj[0].HItemID);
-            $("#HUnitNumber").val(obj[0].HNumber);
-        }
 
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-        //    SQProcName = obj[0].宸ュ簭;
-        //    ProcID = obj[0].HItemID;
-        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
-        //    //$("#HProcID").val(obj[0].HItemID);
-        //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-            }
-            else {
-                return true;
-            }
-        }</script>
+    </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldConkBookBillList.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_MouldConkBookBillList.html"
index f58c7a7..d7f1a1a 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_MouldConkBookBillList.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_MouldConkBookBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>鍣ㄥ叿鏁呴殰鐧昏琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿鏁呴殰鐧昏琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -37,7 +37,7 @@
                                             <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
                                         </select>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -49,30 +49,31 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                     </div>
-                                </div>-->
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                    </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">
+                                <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="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">缁撴潫鏃堕棿</label>
-                                        <div class="layui-input-block">
-                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
-                                        </div>
-                                    </div>
-                                </div>-->
+
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -106,6 +107,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏ㄥ眬鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -117,256 +119,263 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: 'hempid', title: 'hempid', width: 160, hide: true }
-                    , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
-                    , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
-                    , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
-                    , { field: '鏁呴殰绫诲埆浠g爜', title: '鏁呴殰绫诲埆浠g爜', width: 200 }
-                    , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧鍣ㄥ叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200 }
-                    , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200 }
-                    , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: 'HConkReasonID', title: 'HConkReasonID', width: 115, hide: true }
-                    , { field: '鏁呴殰鍘熷洜浠g爜', title: '鏁呴殰鍘熷洜浠g爜', width: 200 }
-                    , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
-                    , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
-                    , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
-                    , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0);
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板鍣ㄥ叿鏁呴殰鐧昏鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫鍣ㄥ叿鏁呴殰鐧昏鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
-                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 });
-                }
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                get_FastQuery();
             });
 
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HCreateBy").val("");//鍒跺崟浜�
+                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#btnSearch").click();
+            });
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
+
+            //#endregion
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: 'hempid', title: 'hempid', width: 160, hide: true }
+                        , { field: '鍙戠幇浜轰唬鐮�', title: '鍙戠幇浜轰唬鐮�', width: 200 }
+                        , { field: '鍙戠幇浜�', title: '鍙戠幇浜�', width: 200 }
+                        , { field: 'HConkTypeID', title: 'HConkTypeID', width: 200, hide: true }
+                        , { field: '鏁呴殰绫诲埆浠g爜', title: '鏁呴殰绫诲埆浠g爜', width: 200 }
+                        , { field: '鏁呴殰绫诲埆', title: '鏁呴殰绫诲埆', width: 200 }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', width: 200 }
+                        , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', width: 200 }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: '鏁呴殰鍙戠敓鏃ユ湡', title: '鏁呴殰鍙戠敓鏃ユ湡', width: 200 }
+                        , { field: '瑕佹眰瀹屽杽鏃ユ湡', title: '瑕佹眰瀹屽杽鏃ユ湡', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'HConkReasonID', title: 'HConkReasonID', width: 115, hide: true }
+                        , { field: '鏁呴殰鍘熷洜浠g爜', title: '鏁呴殰鍘熷洜浠g爜', width: 200 }
+                        , { field: '鏁呴殰鍘熷洜', title: '鏁呴殰鍘熷洜', width: 200 }
+                        , { field: '鏁呴殰鍘熷洜鎻忚堪', title: '鏁呴殰鍘熷洜鎻忚堪', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
+                        , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
+                        , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115}
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load();//閬僵
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
+                    url: GetWEBURL() + '/Sc_MouldConkBookBill/GetMouldConkBookBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HCreateBy) {
+                    sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
 
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿鏁呴殰鐧昏鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                    }
+                });
+            }
+
+            //缂栬緫
+            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: '../妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldConkBookBill/DeltetMouldConkBookBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
 
 
             //浠ヤ笂鏄痩ayui妯″潡
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_MouldMaintainPlanBillList.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_MouldMaintainPlanBillList.html"
index 9ab60ab..f49ddaf 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_MouldMaintainPlanBillList.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_MouldMaintainPlanBillList.html"
@@ -77,12 +77,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Refresh"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -95,6 +95,8 @@
     <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>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -145,9 +147,11 @@
                     case 'btn-Print':
                         get_PrintReport();
                         break;
+                    //鍒锋柊
+                    case 'btn-Refresh': set_Refresh();
+                        break;
                     //閫�鍑烘寜閽�
-                    case 'btn-Close':
-                        parent.layui.admin.events.closeThisTabs();
+                    case 'btn-Exit': Pub_Close(2);
                         break;
                 };
             });
@@ -171,7 +175,7 @@
 
             //蹇�熻繃婊�
             function get_FastQuery(table, option) {
-                
+
                 var HDate = $("#BenginHCreateDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#EndHCreateDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
@@ -184,7 +188,7 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-           
+
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
@@ -241,7 +245,7 @@
                 }
             }
 
-          
+
             //鏂板
             function set_AddNew() {
                 layer.open({
@@ -328,7 +332,7 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             };
-             //鍔犺浇缃戞牸
+            //鍔犺浇缃戞牸
             function get_Display(sWhere) {
                 var ajaxLoad = layer.load();
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -358,6 +362,10 @@
             //鍙嶅鏍�
             function set_AbandonCheck() {
             }
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
index 5dfb709..1b84c46 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_MouldRepairCheckBillList.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_MouldRepairCheckBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍣ㄥ叿缁翠慨楠屾敹鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -37,7 +37,7 @@
                                             <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
                                         </select>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
@@ -49,30 +49,30 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                     </div>
-                                </div>-->
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">寮�濮嬫椂闂�</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">缁撴潫鏃堕棿</label>
+                                    <div class="layui-input-block">
+                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+                                    </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">
+                                <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="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">缁撴潫鏃堕棿</label>
-                                        <div class="layui-input-block">
-                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
-                                        </div>
-                                    </div>
-                                </div>-->
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -82,12 +82,12 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -100,12 +100,15 @@
     <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>
         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
@@ -115,255 +118,301 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                    , { field: '楠屾敹浜轰唬鐮�', title: '楠屾敹浜轰唬鐮�', width: 200 }
-                    , { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 200 }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '楠屾敹閮ㄩ棬浠g爜', title: '楠屾敹閮ㄩ棬浠g爜', width: 200 }
-                    , { field: '楠屾敹閮ㄩ棬', title: '楠屾敹閮ㄩ棬', width: 160 }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 160, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧鍣ㄥ叿浠g爜', width: 160 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200, hide: true }
-                    , { field: '缁翠慨鏃ユ湡', title: '缁翠慨鏃ユ湡', width: 200, templet: "<div>{{d.缁翠慨鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁翠慨鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '楠屾敹缁撹', title: '楠屾敹缁撹', width: 200 }
-                    , { field: '鎽樿', title: '鎽樿', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115, hide: true }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                    , { field: 'HRepairCheckID', title: 'HRepairCheckID', width: 200, hide: true }
-                    , { field: '楠屾敹椤圭洰浠g爜', title: '楠屾敹椤圭洰浠g爜', width: 115 }
-                    , { field: '楠屾敹椤圭洰', title: '楠屾敹椤圭洰', width: 200 }
-                    , { field: '楠屾敹鍐呭', title: '楠屾敹鍐呭', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
-                    , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
-                    , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
+            //#endregion
 
-            var index = layer.load(0);
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板鍣ㄥ叿缁翠慨楠屾敹鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫鍣ㄥ叿缁翠慨楠屾敹鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //鍒锋柊
+                    case 'btn-reload':
+                        get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-exit':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList', 
-                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 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
+            form.on('submit(btnSearch)', function () {//閫夋嫨浠撲綅
+                get_FastQuery();
+            });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function () {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: '楠屾敹浜轰唬鐮�', title: '楠屾敹浜轰唬鐮�', width: 200 }
+                        , { field: '楠屾敹浜�', title: '楠屾敹浜�', width: 200 }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '楠屾敹閮ㄩ棬浠g爜', title: '楠屾敹閮ㄩ棬浠g爜', width: 200 }
+                        , { field: '楠屾敹閮ㄩ棬', title: '楠屾敹閮ㄩ棬', width: 160 }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 160, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧鍣ㄥ叿浠g爜', width: 160 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧鍣ㄥ叿', width: 200, hide: true }
+                        , { field: '缁翠慨鏃ユ湡', title: '缁翠慨鏃ユ湡', width: 200, templet: "<div>{{d.缁翠慨鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁翠慨鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '楠屾敹缁撹', title: '楠屾敹缁撹', width: 200 }
+                        , { field: '鎽樿', title: '鎽樿', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115, hide: true }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: false }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: false, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: false }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: false, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: false }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                        , { field: 'HRepairCheckID', title: 'HRepairCheckID', width: 200, hide: true }
+                        , { field: '楠屾敹椤圭洰浠g爜', title: '楠屾敹椤圭洰浠g爜', width: 115 }
+                        , { field: '楠屾敹椤圭洰', title: '楠屾敹椤圭洰', width: 200 }
+                        , { field: '楠屾敹鍐呭', title: '楠屾敹鍐呭', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                        , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
+                        , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
+                    ]]
+                };
+            };
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //鏂板
+            function set_AddNew()
+            {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鍣ㄥ叿缁翠慨楠屾敹鍗�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            }
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //淇敼
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鏂板鍣ㄥ叿缁翠慨楠屾敹鍗�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.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 HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldRepairCheckBill/DeltetMouldRepairCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬫棩鏈�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鏃ユ湡
+
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HCreateBy) {
+                    sWhere += " and 鍒跺崟浜� like '%" + HBillNo + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                }
+
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Sc_MouldRepairCheckBill/GetMouldRepairCheckBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //閲嶇疆
+            function set_ClearQuery() {
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HCreateBy").val("");//鍒跺崟浜�
+                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#btnSearch").click();
+            }
+
 
 
             //浠ヤ笂鏄痩ayui妯″潡
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 4cda1c6..b1f0a46 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"
@@ -502,8 +502,14 @@
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
 
             //#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index 4fb7b44..a05b1aa 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -288,7 +288,14 @@
 
             //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
-                Pub_Close(1);
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             })
 
             //#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
index 376442a..859149d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillEdit.html"
@@ -214,8 +214,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
             //娓呴櫎
             form.on('submit(Cancel)', function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
index a3f88e3..7aa4794 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillEdit.html"
@@ -332,8 +332,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             });
             //娓呴櫎
             form.on('submit(Cancel)', function () {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index e859474..4b515a6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -345,7 +345,14 @@
             });
             //閫�鍑�
             form.on('submit(Exit)', function () {
-                Pub_Close(1);
+                if (linterid == undefined) {
+                    //鍏抽棴椤电
+                    Pub_Close(2);
+                }
+                else {
+                    //鍏抽棴椤电
+                    Pub_Close(1);
+                }
             })
             //鐩戝惉鎻愪氦
             form.verify({

--
Gitblit v1.9.1