From 241218f741eb8951ca5f3b141547c34565c8cd69 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 15 十月 2021 08:43:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html | 6
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html | 10
WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html | 54 +
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 4
WebTM/views/Baseset/基础资料/Gy_WarehouseList.html | 4
WebTM/views/设备管理/Sb_EquipMaintainBillList.html | 79 +
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 33
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html | 313 ++++++--
WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html | 99 +-
WebTM/views/设备管理/Sb_Add_EqpRepairCheckBillList.html | 866 +++++++++++------------
WebTM/views/基础资料/公用基础资料/HBarPlanPrint.html | 9
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainPlanBill.aspx.designer.cs | 26
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html | 8
WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html | 100 +-
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldTypeBill.aspx.designer.cs | 26
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldTypeBill.aspx | 28
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainPlanBill.aspx | 28
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainPlanBill.aspx.cs | 17
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainBill.aspx.cs | 17
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 167 +++-
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainBill.aspx | 28
WebTM/views/基础资料/公用基础资料/xmlLBM_MouldTypeBill.aspx.cs | 17
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 205 ++++-
WebTM/WebTM.csproj | 24
WebTM/views/基础资料/公用基础资料/xmlLBM_EquipMaintainBill.aspx.designer.cs | 26
25 files changed, 1,459 insertions(+), 735 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 3886e6f..4e17c47 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-13T08:03:18.0167160Z;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2021-10-14T13:03:29.0602929Z;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>10/13/2021 16:03:16</publishTime>
+ <publishTime>10/14/2021 21:03:21</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>10/13/2021 16:03:16</publishTime>
+ <publishTime>10/14/2021 21:03:21</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1110,7 +1110,7 @@
<publishTime>07/07/2021 16:04:21</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>10/12/2021 16:26:14</publishTime>
+ <publishTime>10/13/2021 16:58:09</publishTime>
</File>
<File Include="views/index_Mobile.html">
<publishTime>07/17/2021 23:58:57</publishTime>
@@ -1165,6 +1165,9 @@
</File>
<File Include="views/PublicPage/MouldInformation.html">
<publishTime>08/24/2021 19:07:40</publishTime>
+ </File>
+ <File Include="views/PublicPage/Organizations.html">
+ <publishTime>10/13/2021 16:16:40</publishTime>
</File>
<File Include="views/PublicPage/PartInformation.html">
<publishTime>08/24/2021 19:08:00</publishTime>
@@ -1782,7 +1785,7 @@
<publishTime>10/09/2021 23:48:39</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">
- <publishTime>10/13/2021 10:00:32</publishTime>
+ <publishTime>10/13/2021 16:17:45</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">
<publishTime>10/13/2021 10:00:32</publishTime>
@@ -1803,7 +1806,7 @@
<publishTime>10/13/2021 10:00:32</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
- <publishTime>10/13/2021 16:03:09</publishTime>
+ <publishTime>10/13/2021 16:04:11</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
<publishTime>10/13/2021 10:00:32</publishTime>
@@ -2265,7 +2268,7 @@
<publishTime>10/11/2021 14:53:37</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>10/13/2021 14:14:00</publishTime>
+ <publishTime>10/13/2021 16:42:46</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2277,7 +2280,7 @@
<publishTime>07/01/2021 17:37:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/13/2021 14:13:00</publishTime>
+ <publishTime>10/13/2021 16:59:37</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/11/2021 14:50:18</publishTime>
@@ -2295,7 +2298,7 @@
<publishTime>09/13/2021 18:04:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>10/11/2021 14:44:07</publishTime>
+ <publishTime>10/14/2021 11:30:38</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>09/13/2021 18:04:58</publishTime>
@@ -2304,7 +2307,7 @@
<publishTime>06/29/2021 11:09:29</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>10/11/2021 14:41:45</publishTime>
+ <publishTime>10/14/2021 11:18:33</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
<publishTime>09/13/2021 18:04:58</publishTime>
@@ -2364,7 +2367,7 @@
<publishTime>10/11/2021 14:53:37</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpRepairCheckBillList.html">
- <publishTime>10/13/2021 14:14:00</publishTime>
+ <publishTime>10/13/2021 16:42:46</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpConkBookBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2373,7 +2376,7 @@
<publishTime>08/22/2021 08:56:48</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/13/2021 14:13:00</publishTime>
+ <publishTime>10/13/2021 16:59:37</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/11/2021 14:50:18</publishTime>
@@ -2388,13 +2391,13 @@
<publishTime>09/13/2021 18:04:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>10/11/2021 14:44:07</publishTime>
+ <publishTime>10/14/2021 11:30:38</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>09/13/2021 18:04:58</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>10/11/2021 14:41:45</publishTime>
+ <publishTime>10/14/2021 11:18:33</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
<publishTime>09/13/2021 18:04:58</publishTime>
@@ -2721,7 +2724,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/13/2021 16:00:08</publishTime>
+ <publishTime>10/14/2021 21:03:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 6eae8b9..beef544 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -528,6 +528,8 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdInStockBill.aspx" />
@@ -542,6 +544,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldOtherOutStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdMoveStockBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceList.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPrice.html" />
@@ -826,6 +829,20 @@
<Compile Include="App_Data\MssqlReportData.cs" />
<Compile Include="App_Data\ReportData.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx.cs">
+ <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx.cs">
+ <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_EquipMaintainPlanBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_EquipMaintainPlanBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx.cs">
<DependentUpon>xmlLBM_Gy_Material.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -924,6 +941,13 @@
<Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldProdOutStockBill.aspx.designer.cs">
<DependentUpon>xmlLBM_MouldProdOutStockBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx.cs">
+ <DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_MouldTypeBill.aspx.designer.cs">
+ <DependentUpon>xmlLBM_MouldTypeBill.aspx</DependentUpon>
+ </Compile>
<Compile Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx.cs">
<DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
index 4b67f6b..ea9d7d2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
@@ -47,6 +47,7 @@
}
var params = getUrlVars();
var Type = params[params[0]];
+ var HOtherOrgID = params[params[1]];
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
@@ -93,6 +94,9 @@
if (Value == null) {
Value = '';
}
+ if (HOtherOrgID > 0) {
+ Value = HOtherOrgID;
+ }
$.ajax({
type: "get",
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetWarehouseList_Json",
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_MouldType.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_MouldType.html"
index 4649630..9a05e84 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_MouldType.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_MouldType.html"
@@ -56,7 +56,11 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+
</div>
</script>
</form>
@@ -65,7 +69,7 @@
</div>
</div>
<script>
-
+
var TagId = "";
var TagParentId = "";
var Level = "1";
@@ -160,6 +164,16 @@
//鍒锋柊
case 'get_Refresh': get_Refresh();
break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //瀹℃牳
+ case 'btn-Audit': set_AuditBill();
+ break;
+ //鍙嶅鏍�
+ case 'btn-DeAudit': set_DeAuditBill();
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
@@ -198,8 +212,8 @@
, limits: [50, 200, 500, 1000, 5000, 10000]
, limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 90
- ,limit:50
- ,limits:[50, 200, 500,1000,5000,10000]
+ , limit: 50
+ , limits: [50, 200, 500, 1000, 5000, 10000]
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
@@ -285,7 +299,7 @@
}
});
-
+
}
//鍒犻櫎
@@ -363,8 +377,108 @@
}
};
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
+
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HMouldType&OpenTmp=鍣ㄥ叿鍒嗙被");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+ //瀹℃牳
+ function set_AuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+ var HInterID = data[0].hmainid.toString();
+ if (HBillStatus > 0) {
+ layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+ return false;
+ }
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_DeAuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+ var HInterID = data[0].hmainid.toString();
+ if (HBillStatus = 0) {
+ layer.msg('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+ return false;
+ }
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_Mould/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+
+ }
+
//淇敼鎸夐挳
- function set_ShowBill() {
+ function set_ShowBill() {
if (TagId != "") {
layer.open({
type: 2
@@ -420,7 +534,7 @@
////鏌ヨ鎸夐挳
//form.on('submit(btnSearch)', function (data) {
-
+
// $.ajax({
// url: GetWEBURL() + '/Gy_ModelType/list',
// type: "GET",
@@ -448,54 +562,51 @@
// , format:'yyyy-MM-dd HH:mm'
//});
- //#region 鍒锋柊
- function get_Refresh() {
- set_ClearQuery();
- get_Display(sWhere);
- }
- //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
- ////鏌ヨ鏍戠姸鏁版嵁
- //function getData(sWhere) {
- // var treeData;
+ ////鏌ヨ鏍戠姸鏁版嵁
+ //function getData(sWhere) {
+ // var treeData;
- // $.ajax({
- // url: GetWEBURL() + '/Gy_ModelType/LoadTree',
- // type: "GET",
- // data: { "sWhere": sWhere },
- // async: false,
- // success: function (result) {
- // var data = result.data;
- // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
- // treeData = LoadTree(data);
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_ModelType/LoadTree',
+ // type: "GET",
+ // data: { "sWhere": sWhere },
+ // async: false,
+ // success: function (result) {
+ // var data = result.data;
+ // //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ // treeData = LoadTree(data);
- // }
- // });
- // return treeData;
- //}
- ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
- //function LoadTree(data) {
- // let map = {};
- // let treeData = [];
- // data.forEach(it => {
- // map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
- // })
- // //鐢熸垚缁撴灉闆�
- // data.forEach(it => {
- // const parent = map[it.HParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- // if (parent) {
- // if (!Array.isArray(parent.children)) parent.children = [];
- // parent.children.push(it);
- // } else {
- // treeData.push(it)
- // }
- // })
- // return treeData;
- //}
+ // }
+ // });
+ // return treeData;
+ //}
+ ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ //function LoadTree(data) {
+ // let map = {};
+ // let treeData = [];
+ // data.forEach(it => {
+ // map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ // })
+ // //鐢熸垚缁撴灉闆�
+ // data.forEach(it => {
+ // const parent = map[it.HParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ // if (parent) {
+ // if (!Array.isArray(parent.children)) parent.children = [];
+ // parent.children.push(it);
+ // } else {
+ // treeData.push(it)
+ // }
+ // })
+ // return treeData;
+ //}
</script>
</body>
</html>
+
+
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
index 49aaa4d..aee34bc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/HBarPlanPrint.html"
@@ -114,6 +114,15 @@
//case "HPOOrderBill"://閲囪喘璁㈠崟鍗曟墦鍗�
// CreateDisplayViewerEx("100%", "100%", "../../views/grf/" + OpenTmp + ".grf", "xmlSRM_POInStockBill.aspx?linterid=" + value, true, "");
// break;
+ case "HEquipMaintainPlanBill"://璁惧淇濆吇璁″垝鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipMaintainPlanBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HEquipMaintainBill"://璁惧淇濆吇璁板綍鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_EquipMaintainBill.aspx?linterid=" + value, true, "");
+ break;
+ case "HMouldType"://鍣ㄥ叿鍒嗙被鍗曟墦鍗�
+ CreateDisplayViewerEx("100%", "100%", "../../grf/" + OpenTmp + ".grf", "xmlLBM_MouldTypeBill.aspx?linterid=" + value, true, "");
+ break;
}
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx"
new file mode 100644
index 0000000..d362038
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_EquipMaintainBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipMaintainBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sb_EquipMaintainBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.cs"
new file mode 100644
index 0000000..b459acc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_EquipMaintainBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.designer.cs"
new file mode 100644
index 0000000..ba9703b
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipMaintainBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx"
new file mode 100644
index 0000000..bb78131
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_EquipMaintainPlanBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_EquipMaintainPlanBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Sb_EquipMaintainPlanBillList where hmainid=" + Request.Params["linterid"]+ " order by hsubid");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.cs"
new file mode 100644
index 0000000..4a474cc
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_EquipMaintainPlanBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.designer.cs"
new file mode 100644
index 0000000..5915c8f
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_EquipMaintainPlanBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_EquipMaintainPlanBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx"
new file mode 100644
index 0000000..9e0cc78
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx"
@@ -0,0 +1,28 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="xmlLBM_MouldTypeBill.aspx.cs" Inherits="WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡.xmlLBM_MouldTypeBill" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title></title>
+ <script runat="server">
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ //鈽呯壒鍒彁绀衡槄锛�
+ //涓嶅悓鐨勬暟鎹簱搴旇閫夌敤涓嶅悓鐨勬姤琛╔ML鏁版嵁鐢熸垚绫伙紝SQL Server鏁版嵁搴撶敤SqlXMLReportData锛孫racle鏁版嵁搴撶敤OracleXMLReportData
+ //OledbXMLReportData閫傚悎浜嶢ccess绛夋湰鍦版暟鎹簱锛屼负浜嗘紨绀烘柟渚匡紝杩欓噷浠嶨rid++Report鐨凙ccess渚嬪瓙鏁版嵁搴撲腑鑾峰彇鎶ヨ〃鏁版嵁
+
+ //OledbXMLReportData.GenOneRecordset(this, "select * from Customers order by CustomerID");
+ //SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Kf_POStockInBillList_K3 where hmainid=1781");
+ SqlXMLReportData.GenOneRecordset(this, "select * from h_v_Gy_MouldTypeList where HItemID=" + Request.Params["linterid"]+ " order by hsubid");
+ }
+</script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div>
+ </div>
+ </form>
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.cs"
new file mode 100644
index 0000000..b6367ef
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.cs"
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+ public partial class xmlLBM_MouldTypeBill : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.designer.cs" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.designer.cs"
new file mode 100644
index 0000000..a7497e4
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/xmlLBM_MouldTypeBill.aspx.designer.cs"
@@ -0,0 +1,26 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace WebTM.views.鍩虹璧勬枡.鍏敤鍩虹璧勬枡
+{
+
+
+ public partial class xmlLBM_MouldTypeBill
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
index 86be75b..faa766e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
@@ -113,58 +113,66 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
-
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label">璋冩嫧绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
+ <option value="鍚岀粍缁囪皟鎷�">鍚岀粍缁囪皟鎷�</option>
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ <div class="layui-form-item">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</div>
</div>
</div>
</div>
</div>
</div>
- </div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- </div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
</form>
</div>
</div>
@@ -174,7 +182,6 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -222,6 +229,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 500
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
@@ -239,9 +247,13 @@
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgCode', title: '璋冨嚭缁勭粐浠ｇ爜', edit: 'text', event: 'HOtherOrgCode', width: 120 }
+ , { field: 'HOtherOrgName', title: '璋冨嚭缁勭粐', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
, { field: 'HWHCode', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '璋冨叆浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HWHName', title: '璋冨叆浠撳簱', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '璋冨叆浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
, { field: 'HSPName', title: '璋冨叆浠撲綅', edit: 'text', width: 100 }
@@ -254,12 +266,11 @@
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -292,13 +303,14 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "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;
@@ -316,7 +328,7 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
+
}
break;
}
@@ -388,6 +400,59 @@
});
}
+ if (obj.event === 'HOtherOrgCode') //缁勭粐
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁勭粐鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/Organizations.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ var HStockStyle = $("#HStockStyle").val();
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁� {
+ {
+ if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屽綋鍓嶇粍缁囷細' + sessionStorage["Organization"] + '璇烽�夋嫨鍏朵粬缁勭粐');
+ }
+ }
+ else {
+ if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛岃閫夋嫨褰撳墠缁勭粐锛�' + sessionStorage["Organization"]);
+ }
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HOtherOrgID: checkStatus.data[0].HItemID,
+ HOtherOrgCode: checkStatus.data[0].HNumber,
+ HOtherOrgName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
if (obj.event === 'HWHCode') //璋冨叆浠撳簱浠ｇ爜
{
//椤甸潰灞�-鑷畾涔�
@@ -399,7 +464,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -470,6 +535,10 @@
}
if (obj.event === 'HSCWHCode') //璋冨嚭浠撳簱浠ｇ爜
{
+ var HOtherOrgID = obj.data.HOtherOrgID;
+ if (HOtherOrgID == 0 || HOtherOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨嚭缁勭粐');
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -479,7 +548,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HOtherOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -674,7 +743,7 @@
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HWHID": data.HWHID1 //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
, "HKeeperID": data.hkeeperid //淇濈鍛業D
@@ -685,6 +754,7 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
});
} else {
@@ -955,6 +1025,8 @@
//}
}
});
+
+
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -1000,6 +1072,7 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ var HStockStyle = $("#HStockStyle").val();
var Result = true;
if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1016,7 +1089,7 @@
if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
- }
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -1036,6 +1109,14 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
index 85c81b1..6e782d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
@@ -152,9 +152,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- //, { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125 }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
@@ -175,6 +174,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100}
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
@@ -187,8 +189,6 @@
, { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true }
, { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true }
, { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true }
- , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
- , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
, { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
, { field: '鍗曚环', title: '鍗曚环', width: 125 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
index c288cb9..97f188f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
@@ -65,17 +65,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSecManagerName" readonly id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -85,27 +87,34 @@
<div class="layui-inline">
<label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
-
-
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冩嫧绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
+ <option value="鍚岀粍缁囪皟鎷�">鍚岀粍缁囪皟鎷�</option>
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -121,8 +130,6 @@
<input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -223,17 +230,27 @@
, { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
, { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
- , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HUseLife', title: '绱浣跨敤瀵垮懡', edit: 'text', width: 120 }
, { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HStockOrgCode', title: '璋冨叆缁勭粐浠ｇ爜', edit: 'text', event: 'HStockOrgCode', width: 120 }
+ , { field: 'HStockOrgName', title: '璋冨叆缁勭粐', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 100 }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HWHCode', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: 'HWHName', title: '璋冨叆浠撳簱', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
- , { field: 'HSPCode', title: '浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 100 }
- , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HSPCode', title: '璋冨叆浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
+ , { field: 'HSPName', title: '璋冨叆浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HSCWHID', title: 'HSCWHID', edit: 'text', width: 100, hide: true }
+ , { field: 'HSCWHCode', title: '璋冨嚭浠撳簱浠ｇ爜', edit: 'text', event: 'HSCWHCode', width: 120 }
+ , { field: 'HSCWHName', title: '璋冨嚭浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HSCSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
+ , { field: 'HSCSPCode', title: '璋冨嚭浠撲綅浠ｇ爜', edit: 'text', event: 'HSCSPCode', width: 120 }
+ , { field: 'HSCSPName', title: '璋冨嚭浠撲綅', edit: 'text', width: 100 }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -242,7 +259,7 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -278,7 +295,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -373,9 +390,65 @@
}
});
}
-
- if (obj.event === 'HWHCode') //浠撳簱浠ｇ爜
+ if (obj.event === 'HStockOrgCode') //缁勭粐
{
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁勭粐鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/Organizations.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ var HStockStyle = $("#HStockStyle").val();
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁� {
+ {
+ if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屽綋鍓嶇粍缁囷細' + sessionStorage["Organization"] + '璇烽�夋嫨鍏朵粬缁勭粐');
+ }
+ }
+ else {
+ if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛岃閫夋嫨褰撳墠缁勭粐锛�' + sessionStorage["Organization"]);
+ }
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HStockOrgID: checkStatus.data[0].HItemID,
+ HStockOrgCode: checkStatus.data[0].HNumber,
+ HStockOrgName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HWHCode') //璋冨叆浠撳簱浠ｇ爜
+ {
+ var HStockOrgID = obj.data.HStockOrgID;
+ if (HStockOrgID == 0 || HStockOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨叆缁勭粐');
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -385,7 +458,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HStockOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -441,6 +514,90 @@
HSPID: checkStatus.data[0].HItemID,
HSPCode: checkStatus.data[0].HNumber,
HSPName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HSCWHCode') //璋冨嚭浠撳簱浠ｇ爜
+ {
+ var HOtherOrgID = obj.data.HOtherOrgID;
+ if (HOtherOrgID == 0 || HOtherOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨嚭缁勭粐');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSCWHID: checkStatus.data[0].HItemID,
+ HSCWHCode: checkStatus.data[0].HNumber,
+ HSCWHName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HSCSPCode') //璋冨嚭浠撲綅浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撲綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareLocationInformation.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({
+ HSCSPID: checkStatus.data[0].HItemID,
+ HSCSPCode: checkStatus.data[0].HNumber,
+ HSCSPName: checkStatus.data[0].HName,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -581,8 +738,8 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HWHID": data.HWHID1 //浠撳簱ID
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
, "HKeeperID": data.hkeeperid //淇濈鍛業D
@@ -593,6 +750,7 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
});
} else {
@@ -800,18 +958,6 @@
}
});
-
-
-
-
-
-
- //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),
@@ -830,8 +976,10 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
-
-
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -934,62 +1082,61 @@
//$("#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;
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var HStockStyle = $("#HStockStyle").val();
+ var Result = true;
+ if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("棰嗘枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("鍙戞枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = 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 ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if (typeof (sSubStr) == "undefined") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return 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].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HSCWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨叆缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨叆缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
- return true;
+ return Result = true;
}
- }</script>
+ return Result;
+ }
+
+ </script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
index 0d59bab..761acc4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
@@ -153,9 +153,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- //, { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125 }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
@@ -176,6 +175,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100 }
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
index 5564e47..b83e44f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
@@ -35,8 +35,8 @@
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>-->
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
index 296b4b7..f97150f 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpRepairCheckBillList.html"
@@ -165,23 +165,20 @@
<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>
- //鑾峰彇鍙傛暟
- 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;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
}
-
-
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
layui.config({
@@ -189,6 +186,8 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -197,294 +196,33 @@
, laydate = layui.laydate
, element = layui.element;
- //甯歌鐢ㄦ硶
- laydate.render({
- elem: '#HDate'
+ var option;
+ var sBillType = "3911";
+ var TabRow = { "HRepairCheckID": 0, "HRepairCheckCode": "", "HRepairCheckName": " ", "HRepairCheckContent": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HRemark": " " };
- });
- laydate.render({
- elem: '#HCheckBeginDate'
- });
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //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: 'HRepairCheckID', title: 'HRepairCheckID', hide: true }
- , { field: 'HRepairCheckCode', title: '楠屾敹椤圭洰浠ｇ爜', edit: 'text', event: "HRepairCheckCode" }
- , { field: 'HRepairCheckName', title: '楠屾敹椤圭洰', edit: 'text' }
- , { field: 'HRepairCheckContent', title: '楠屾敹鍐呭', edit: 'text' }
- , { field: 'HManagerID', title: 'HManagerID', 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": " " }];
- table.render(option);
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鍗�
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+
+ set_EditFromGrid();
}
else {
- $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListProjectDetai',
- type: "GET",
- data: { "sqlWhere": "and hmainid=" + hID },
- success: function (result) {
- console.log(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
-
- //澶村伐鍏锋爮浜嬩欢
- 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;
- }
- });
- //琛屽唴浜嬩欢
- 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 === 'HRepairCheckCode') //楠屾敹椤圭洰浠ｇ爜
- {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '楠屾敹椤圭洰鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../PublicPage/RepairCheckItemInformation.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({
- HRepairCheckID: checkStatus.data[0].HItemID,
- HRepairCheckCode: checkStatus.data[0].HNumber,
- HRepairCheckName: checkStatus.data[0].HName,
- });
-
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- 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 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- }
- });
- }
-
- obj.event = "";
- return false;
-
- }
- })
-
- });
-
-
-
- function RoadBillMain(hID)//鍔犺浇琛ㄥご
- {
- alert(hID);
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListCheckDetai",
- type: "GET",
- data: {
- "HID": hID
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sb_EquipRepairCheckBillList_Edit[0];
- form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HDeptID": data.HDeptID //楠屾敹閮ㄩ棬ID
- , "HDeptName": data.缁翠慨閮ㄩ棬鍚嶇О //楠屾敹閮ㄩ棬鍚嶇О
- , "HEmpID": data.HEmpID //楠屾敹浜篒D
- , "HEmpName": data.楠屾敹浜� //楠屾敹浜哄悕绉�
- , "HManagerID": data.HManagerID //璐熻矗浜篒D
- , "HManagerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
- , "HEquipID": data.HEquipID //璁惧ID
- , "HEquipName": data.璁惧鍚嶇О //璁惧
- , "HCheckBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //缁翠慨鏃ユ湡
- , "HCheckResult": 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": '3911' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HCheckBeginDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(hID);
- /* RoadBillSub(linterid);*/
- }
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//琛ㄥご淇℃伅閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -638,41 +376,31 @@
});
});
-
-
-
-
-
-
- form.on('submit(Exit)', function (data) {//
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ // 琛ㄤ綋宸ュ叿鏍忎簨浠�
+ 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;
+ }
});
+ //琛ㄤ綋琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
-
-
- 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;
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -706,135 +434,383 @@
}
});
});
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (closeType == 0) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
+ if (closeType == 1) {
+ //鍏抽棴寮圭獥
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ } else if (closeType == 2) {
+ //鍏抽棴椤电
+ parent.layui.admin.events.closeThisTabs();
+ }
+ });
+
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
}
+ //#endregion
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+
+ laydate.render({
+ elem: '#HCheckBeginDate'
+ });
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HRepairCheckID', title: 'HRepairCheckID', hide: true }
+ , { field: 'HRepairCheckCode', title: '楠屾敹椤圭洰浠ｇ爜', edit: 'text', event: "HRepairCheckCode" }
+ , { field: 'HRepairCheckName', title: '楠屾敹椤圭洰', edit: 'text' }
+ , { field: 'HRepairCheckContent', title: '楠屾敹鍐呭', edit: 'text' }
+ , { field: 'HManagerID', title: 'HManagerID', 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 }
+ ];
+ 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 set_EditFromGrid() {
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ 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) {
+ //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_EditForm(linterid) {
+
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sb_EquipRepairCheckBillList_Edit[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HDeptID": data.HDeptID //楠屾敹閮ㄩ棬ID
+ , "HDeptName": data.缁翠慨閮ㄩ棬鍚嶇О //楠屾敹閮ㄩ棬鍚嶇О
+ , "HEmpID": data.HEmpID //楠屾敹浜篒D
+ , "HEmpName": data.楠屾敹浜� //楠屾敹浜哄悕绉�
+ , "HManagerID": data.HManagerID //璐熻矗浜篒D
+ , "HManagerName": data.璐熻矗浜� //璐熻矗浜哄悕绉�
+ , "HEquipID": data.HEquipID //璁惧ID
+ , "HEquipName": data.璁惧鍚嶇О //璁惧
+ , "HCheckBeginDate": formatDate(data.鍙戠敓鏃ユ湡) //缁翠慨鏃ユ湡
+ , "HCheckResult": data.楠屾敹缁撹 //楠屾敹缁撹
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+
+ // 缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sb_EqpRepairWorkBill/Sb_EqpRepairCheckBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + linterid },
+ success: function (result) {
+ console.log(result);
+ //console.log('gouba' + result);
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ }
+
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
}
- });
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ var rowIndex = $(obj.tr).attr("data-index");
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ obj.del();
+ option.data.splice(rowIndex, 1);//鍒犻櫎缂撳瓨鐨勮
+ table.reload('mainTable', option);
+ layer.close(index);
- });
- //瀹氫箟鍏ㄥ眬鍙橀噺
- 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].宸ュ簭浠ｇ爜);
- }
- 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) { //杩斿洖璐ｄ换浜�
- 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) { //杩斿洖璐ｄ换宸ュ簭
- 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;
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ 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') //楠屾敹椤圭洰浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '楠屾敹椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../PublicPage/RepairCheckItemInformation.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({
+ HRepairCheckID: checkStatus.data[0].HItemID,
+ HRepairCheckCode: checkStatus.data[0].HNumber,
+ HRepairCheckName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ 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 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ 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;
- // }
- // }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // 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: "娓╅Θ鎻愮ず" });
+ 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;
+ }
}
- else {
- return true;
- }
- }</script>
+
+ //#endregion
+ });
+ </script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
index bef04a0..1a01921 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpRepairCheckBillList.html"
@@ -102,6 +102,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -226,7 +228,7 @@
]]
}
}
-
+
//鍔犺浇鏁版嵁鍒扮綉鏍�
function get_Display(sWhere) {
var wait = layer.load();//閬僵
@@ -358,7 +360,7 @@
if (HDate1) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
}
-
+
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
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 7aa4794..3471374 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"
@@ -23,10 +23,11 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="add-btn">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
</div>
@@ -240,10 +241,10 @@
var NewRow = TabRow1;
switch (obj.event) {
//鏂板涓�琛�
- case 'btn-AddLine': btnAddLine1(NewRow);
+ case 'btn-AddLine1': btnAddLine1(NewRow);
break;
//澶嶅埗涓�琛�
- case 'btn-CopyLine': btnCopyLine1(data);
+ case 'btn-CopyLine1': btnCopyLine1(data);
break;
}
});
@@ -291,6 +292,13 @@
}
});
});
+
+ //鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ $("#component-form-group")[0].reset();
+ layui.form.render();
+ set_AddFNew();
+ });
//淇濆瓨
form.on('submit(Saver)', function (data) {
//debugger;
@@ -299,7 +307,10 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
- //if (AllowLoadData(sSubStr, sSubStr1)) {
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -328,7 +339,16 @@
console.log("Reason" + sMainStr);
}
});
- //}
+ });
+ //棰勮Printing
+ form.on("submit(view)", function (data) {
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEquipMaintainBill&OpenTmp=璁惧淇濆吇璁板綍鏉＄爜");
+
+ });
+ //鎵撳嵃Printing
+ form.on("submit(print)", function (data) {
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEquipMaintainBill&OpenTmp=璁惧淇濆吇璁板綍鏉＄爜");
+
});
//閫�鍑�
form.on('submit(Exit)', function (data) {//
@@ -347,6 +367,7 @@
parent.location.href = "../../../views/index.html"
//window.close();//鍏抽棴褰撳墠椤�
})
+
//鐩戝惉鎻愪氦
form.verify({
numberOrEmpty: function (value, item) {
@@ -495,7 +516,7 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HEquipName": data.璁惧鍚嶇О
+ , "HEquipName": data.璁惧鍚嶇О
, "HEquipID": data.璁惧ID //璁惧
, "HExplanation": data.鎽樿 //鎽樿
, "HBeginDate": data.寮�濮嬫棩鏈� //
@@ -520,7 +541,7 @@
$.ajax({
url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
type: "GET",
- data: { "HInterID": linterid},
+ data: { "HInterID": linterid },
success: function (result) {
console.log(result);
//console.log('gouba' + result);
@@ -553,7 +574,7 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
table.cache["mainTable"].push(NewRow);
- option1.data = table.cache["mainTable"];
+ option.data = table.cache["mainTable"];
table.render(option);
}
//澧炲姞涓�琛�1
@@ -800,8 +821,7 @@
});
}
//璐熻矗浜轰俊鎭�
- if (obj.event === 'HManagerNumber')
- {
+ if (obj.event === 'HManagerNumber') {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -848,48 +868,54 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ var Result = true;
+ if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
+ layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
if (sSubStr[i].HMaintainItemID == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (sSubStr[i].HMaintainItem == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (sSubStr[i].HManagerNumber == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐ｄ换浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
}
}
- if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
- sSubStr1 = JSON.parse(sSubStr1);
- for (var i = 0; i < sSubStr1.length; i++) {
- if (sSubStr1[i].HMaterNumber == "") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr1[i].HUnitNumber == "") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr[i].HManagerNumber == "") {
- layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- }
+ //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
+ // sSubStr1 = JSON.parse(sSubStr1);
+ // for (var i = 0; i < sSubStr1.length; i++) {
+ // if (sSubStr1[i].HMaterNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr1[i].HUnitNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr[i].HManagerNumber == "") {
+ // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // }
+ //}
else {
- return true;
+ return Result = true;
}
+ return Result;
}
function f_alert(sMsg) {
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 1d0acdd..fbaafe4 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -29,15 +29,15 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
- <div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
- </div>
- </div>-->
+ <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="HBillType" id="HBillType">
+ <option value="">鎵�鏈�</option>
+ <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
+ <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
+ </select>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -97,6 +97,10 @@
<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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -116,6 +120,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -162,6 +168,23 @@
case 'btn-Delete':
set_DeleteBill();
break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //鎵撳嵃
+ case 'btn-print':
+ get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh':
+ set_Refresh();
+ break;
+
+ //閫�鍑�
+ case 'get_Exit':
+ Pub_Close(2);
+ break;
};
});
@@ -169,7 +192,7 @@
table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
var linterid = datas.hmainid;
- $.ajax({
+ $.ajax({
url: GetWEBURL() + 'Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew',
type: "GET",
data: { "HInterID": linterid },
@@ -344,7 +367,7 @@
})
}
-
+
var index = layer.load(0);
//鏂板
function set_AddNew() {
@@ -430,6 +453,36 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipMaintainBill&OpenTmp=璁惧淇濆吇璁板綍鏉＄爜");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipMaintainBill&OpenTmp=璁惧淇濆吇璁板綍鏉＄爜");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
//蹇�熻繃婊�
function get_FastQuery() {
//var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
@@ -464,8 +517,8 @@
$("#btnSearch").click();
}
-
- //#endregion
+
+ //#endregion
});
</script>
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 4b515a6..8eff934 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"
@@ -23,8 +23,10 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="add-btn">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="print">鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -253,10 +255,10 @@
var NewRow = TabRow1;
switch (obj.event) {
//鏂板涓�琛�
- case 'btn-AddLine': btnAddLine1(NewRow);
+ case 'btn-AddLine1': btnAddLine1(NewRow);
break;
//澶嶅埗涓�琛�
- case 'btn-CopyLine': btnCopyLine1(data);
+ case 'btn-CopyLine1': btnCopyLine1(data);
break;
}
});
@@ -304,6 +306,12 @@
}
});
});
+ //鏂板
+ form.on('submit(set_AddNew)', function (data) {
+ $("#component-form-group")[0].reset();
+ layui.form.render();
+ set_AddFNew();
+ });
//淇濆瓨
form.on('submit(Saver)', function (data) {
//debugger;
@@ -312,7 +320,10 @@
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
- //if (AllowLoadData(sSubStr, sSubStr1)) {
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -341,7 +352,17 @@
console.log("Reason" + sMainStr);
}
});
- //}
+
+ });
+ //棰勮Printing
+ form.on("submit(view)", function (data) {
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEquipMaintainPlanBill&OpenTmp=璁惧淇濆吇璁″垝鏉＄爜");
+
+ });
+ //鎵撳嵃Printing
+ form.on("submit(print)", function (data) {
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + linterid + "&Type=HEquipMaintainPlanBill&OpenTmp=璁惧淇濆吇璁″垝鏉＄爜");
+
});
//閫�鍑�
form.on('submit(Exit)', function () {
@@ -561,7 +582,7 @@
//澧炲姞涓�琛�
function btnAddLine(NewRow) {
table.cache["mainTable"].push(NewRow);
- option1.data = table.cache["mainTable"];
+ option.data = table.cache["mainTable"];
table.render(option);
}
//澧炲姞涓�琛�
@@ -854,65 +875,63 @@
})
}
//闈炵┖楠岃瘉
- function AllowLoadData(sSubStr, sSubStr1) {
- if ($("#HInnerBillNo").val() == '') {
- layer.msg("璇烽�夋嫨鍐呴儴鍗曟嵁鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+ function AllowLoadData(sSubStr) {
+ var Result = true;
if ($("#HEquipID").val() == '' || $("#HEquipName").val() == '') {
layer.msg("璇烽�夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if ($("#HCheckCycle").val() == '' || $("#HCheckCycle").val() == '0') {
layer.msg("璇疯緭鍏ヤ繚鍏诲懆鏈�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
sSubStr = JSON.parse(sSubStr);
for (var i = 0; i < sSubStr.length; i++) {
if (sSubStr[i].HMaintainItemID == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (sSubStr[i].HMaintainItem == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
if (sSubStr[i].HManagerNumber == "") {
layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ return Result = false;
}
}
}
- if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
- sSubStr1 = JSON.parse(sSubStr1);
- for (var i = 0; i < sSubStr1.length; i++) {
- if (sSubStr1[i].HMaterNumber == "") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr1[i].HUnitNumber == "") {
- layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (sSubStr[i].HManagerNumber == "") {
- layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- }
- }
+ //if (typeof (sSubStr1) == "undefined" || sSubStr1 == "" || sSubStr1 == "[]") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
+ // sSubStr1 = JSON.parse(sSubStr1);
+ // for (var i = 0; i < sSubStr1.length; i++) {
+ // if (sSubStr1[i].HMaterNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr1[i].HUnitNumber == "") {
+ // layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠ｇ爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (sSubStr[i].HManagerNumber == "") {
+ // layer.msg("淇濆吇椤规槑缁嗚褰曠" + (i + 1) + "琛�,璐熻矗浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // }
+ //}
else {
- return true;
+ return Result = true;
}
+ return Result;
}
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 95cfa16..bf5f3c6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -97,6 +97,10 @@
<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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -116,6 +120,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -160,8 +166,26 @@
case 'btn-Edit':
set_ShowBill();
break;
+ //鍒犻櫎
case 'btn-Delete':
set_DeleteBill();
+ break;
+ //娴忚
+ case 'btn-view':
+ get_ViewReport();
+ break;
+ //鎵撳嵃
+ case 'btn-print':
+ get_PrintReport();
+ break;
+ //鍒锋柊
+ case 'get_Refresh':
+ set_Refresh();
+ break;
+
+ //閫�鍑�
+ case 'get_Exit':
+ Pub_Close(2);
break;
};
});
@@ -424,6 +448,36 @@
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
}
+ //棰勮
+ function get_ViewReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipMaintainPlanBill&OpenTmp=璁惧淇濆吇璁″垝鏉＄爜");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ window.open("../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html?linterid=" + InterID + "&Type=HEquipMaintainPlanBill&OpenTmp=璁惧淇濆吇璁″垝鏉＄爜");
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
//蹇�熻繃婊�
function get_FastQuery(table, option) {
//var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
--
Gitblit v1.9.1