From 2c1c3d8461792236fed59612689931936c3ec502 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 29 十月 2021 17:43:52 +0800
Subject: [PATCH] 用户关联供应商优化
---
WebTM/views/模治具管理/模具报废入库单/Sc_MouldScrapInBill_PDA.html | 8
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html | 10
WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 130 ++-
WebTM/views/index_Mobile.html | 34
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 1
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html | 10
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 1
WebTM/views/模治具管理/模具采购入库单/Sc_MouldProdInBill_PDA.html | 196 ++--
WebTM/views/模治具管理/模具处理出库单/Sc_MouldScrapOutBill_PDA.html | 13
WebTM/views/基础资料/销售基础资料/Gy_Customer.html | 1
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 59 -
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 1
WebTM/views/模治具管理/模具生产退库单/Sc_MouldProdBackBill_PDA.html | 60 -
WebTM/views/模治具管理/模治具点检保养/Sc_MouldDotCheckBill_PDA.html | 6
WebTM/views/index.html | 3
WebTM/views/模治具管理/设备保养记录单/Sb_EquipMaintainBill_PDA.html | 258 +++---
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 1
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 3
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2
WebTM/views/系统管理/用户管理/Xt_UserSuplies.html | 2
WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html | 2
WebTM/views/模治具管理/模具生产领用单/Sc_MouldProdOutBill_PDA.html | 48
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 1
WebTM/views/模治具管理/设备点检记录单/Sb_EquipDotCheckBill_PDA.html | 258 +++---
/dev/null | 439 ------------
WebTM/views/模治具管理/设备维修记录单/Sb_EquipRepairWorkBill_PDA.html | 258 +++---
WebTM/views/模治具管理/模治具点检保养/Sc_MouldMaintainBill_PDA.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/模治具管理/模具改制入库单/Sc_MouldRepairInBill_PDA.html | 165 +--
WebTM/views/模治具管理/模具改制出库单/Sc_MouldRepairOutBill_PDA.html | 165 +--
WebTM/views/基础资料/公用基础资料/Gy_Currency.html | 1
WebTM/WebTM.csproj | 12
33 files changed, 789 insertions(+), 1,367 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 74a8b04..dca56f2 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-29T02:13:17.6371577Z;True|2021-10-29T10:09:18.4344506+08:00;True|2021-10-29T10:02:04.5175848+08:00;True|2021-10-29T09:53:18.4824534+08:00;True|2021-10-26T10:53:01.9361750+08:00;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2021-10-26T02:53:01.9361750Z;True|2021-10-26T10:16:47.9563018+08:00;True|2021-10-22T17:13:17.3720952+08:00;True|2021-10-22T13:35:53.6896430+08:00;True|2021-10-22T13:31:19.8714386+08:00;True|2021-10-22T13:24:04.4805705+08:00;True|2021-10-22T13:18:41.9271606+08:00;True|2021-10-22T13:10:00.9550366+08:00;True|2021-10-22T13:03:14.5902813+08:00;True|2021-10-22T13:03:10.2311098+08:00;True|2021-10-22T12:58:01.5450926+08:00;True|2021-10-22T12:51:22.6508324+08:00;True|2021-10-22T12:44:14.8878722+08:00;True|2021-10-22T12:39:46.9039349+08:00;True|2021-10-22T12:33:42.4309896+08:00;True|2021-10-22T10:08:54.5752476+08:00;True|2021-10-21T09:30:55.8167159+08:00;True|2021-10-21T09:19:58.6892526+08:00;True|2021-10-21T09:15:39.0207025+08:00;True|2021-10-21T09:08:23.6455813+08:00;True|2021-10-21T09:05:17.7154494+08:00;True|2021-10-21T09:02:01.4347122+08:00;True|2021-10-21T09:00:43.2847798+08:00;True|2021-10-20T10:08:38.3526743+08:00;True|2021-10-19T21:31:14.4753280+08:00;True|2021-10-19T21:29:43.2359222+08:00;True|2021-10-19T21:27:52.0856399+08:00;True|2021-10-19T21:24:29.3747362+08:00;True|2021-10-19T21:23:37.0346854+08:00;True|2021-10-19T21:20:44.0366463+08:00;True|2021-10-19T21:05:49.1734251+08:00;True|2021-10-19T20:56:31.8598501+08:00;True|2021-10-19T20:55:07.4573445+08:00;True|2021-10-19T20:52:47.8843673+08:00;True|2021-10-19T20:47:16.0981497+08:00;True|2021-10-19T20:35:57.8948663+08:00;True|2021-10-19T20:08:43.0992863+08:00;True|2021-10-19T18:55:59.0823669+08:00;True|2021-10-19T18:21:24.5219336+08:00;True|2021-10-19T18:20:05.4930306+08:00;True|2021-10-19T18:17:15.1841910+08:00;True|2021-10-19T18:12:51.0075982+08:00;True|2021-10-19T18:09:40.0963972+08:00;True|2021-10-19T18:08:09.8505141+08:00;True|2021-10-19T18:07:05.9340851+08:00;True|2021-10-19T17:52:17.4253820+08:00;True|2021-10-19T16:34:19.7523737+08:00;True|2021-10-19T15:53:56.9797710+08:00;True|2021-10-19T11:24:38.8752607+08:00;True|2021-10-19T11:23:04.2837375+08:00;True|2021-10-19T11:13:52.3197500+08:00;True|2021-10-19T10:51:58.7845034+08:00;True|2021-10-19T10:49:49.7136089+08:00;True|2021-10-19T10:40:25.1535305+08:00;True|2021-10-19T10:33:39.1471329+08:00;True|2021-10-19T10:26:58.9241088+08:00;True|2021-10-18T08:49:46.6105634+08:00;True|2021-10-15T10:20:46.2792894+08:00;True|2021-10-14T21:03:29.0602929+08:00;True|2021-10-14T11:33:04.8005393+08:00;True|2021-10-14T11:19:00.7774035+08:00;True|2021-10-14T11:17:34.4973199+08:00;True|2021-10-14T11:16:21.3877266+08:00;True|2021-10-14T11:12:51.0130993+08:00;True|2021-10-14T11:05:17.3946201+08:00;True|2021-10-14T11:02:23.1262669+08:00;True|2021-10-14T11:01:18.7643791+08:00;True|2021-10-14T10:57:40.3127444+08:00;True|2021-10-14T10:52:10.3791977+08:00;True|2021-10-14T10:45:18.4318598+08:00;True|2021-10-14T10:40:46.2070267+08:00;True|2021-10-14T10:30:06.1773994+08:00;True|2021-10-14T10:24:50.9422072+08:00;True|2021-10-14T10:23:00.2117772+08:00;True|2021-10-14T10:12:51.0530894+08:00;True|2021-10-14T09:12:16.9768000+08:00;True|2021-10-13T16:59:53.0018074+08:00;True|2021-10-13T16:45:35.3921106+08:00;True|2021-10-13T16:41:41.0342581+08:00;True|2021-10-13T16:03:18.0167160+08:00;True|2021-10-13T16:02:53.5790785+08:00;True|2021-10-13T16:00:11.0703898+08:00;True|2021-10-13T13:36:13.3432081+08:00;True|2021-10-13T13:14:13.8788707+08:00;True|2021-10-13T09:38:20.1222222+08:00;True|2021-10-12T16:38:51.8845201+08:00;True|2021-10-12T14:16:58.5755022+08:00;True|2021-10-12T14:15:01.4590544+08:00;True|2021-10-12T14:13:00.7711433+08:00;True|2021-10-12T13:50:34.3642535+08:00;True|2021-10-12T13:49:08.9981833+08:00;True|2021-10-12T13:45:46.0865198+08:00;True|2021-10-12T13:37:49.3998195+08:00;True|2021-10-12T13:34:26.4352255+08:00;True|2021-10-12T13:27:34.1063777+08:00;True|2021-10-11T17:47:00.0758932+08:00;True|2021-10-11T17:24:54.8953424+08:00;True|2021-10-11T17:21:45.9185999+08:00;True|2021-10-11T17:03:59.6847675+08:00;True|2021-10-11T16:52:33.8659259+08:00;True|2021-10-11T16:46:37.4680156+08:00;True|2021-10-11T16:32:09.1274020+08:00;True|2021-10-11T16:20:01.2008705+08:00;True|2021-10-11T15:47:21.5381756+08:00;True|2021-10-11T15:24:50.1291214+08:00;True|2021-10-11T15:17:32.6449773+08:00;True|2021-10-11T13:58:17.0798825+08:00;True|2021-10-11T13:51:35.5979470+08:00;True|2021-10-11T13:48:52.7067744+08:00;True|2021-10-11T13:44:20.5680336+08:00;True|2021-10-11T13:41:00.0722088+08:00;True|2021-10-11T13:31:15.2469323+08:00;True|2021-10-11T11:30:51.1802904+08:00;True|2021-10-11T10:15:37.9555153+08:00;True|2021-10-11T10:12:22.9911274+08:00;True|2021-10-10T22:35:43.6802937+08:00;True|2021-10-10T22:34:26.6327036+08:00;True|2021-10-10T21:54:48.6450651+08:00;True|2021-10-10T21:42:57.3262174+08:00;True|2021-10-10T21:33:49.9525197+08:00;True|2021-10-10T21:32:04.4181776+08:00;True|2021-10-10T21:30:13.5045202+08:00;True|2021-10-10T21:28:41.4381706+08:00;True|2021-10-10T21:26:28.1089104+08:00;True|2021-10-10T21:19:07.4649421+08:00;True|2021-10-10T21:18:07.3348385+08:00;True|2021-10-10T21:15:27.0610525+08:00;True|2021-10-10T21:03:45.9763886+08:00;True|2021-10-10T20:58:34.9931987+08:00;True|2021-10-10T20:24:37.7181597+08:00;True|2021-10-10T20:22:25.2661328+08:00;True|2021-10-10T20:18:46.5529409+08:00;True|2021-10-10T20:17:10.0519990+08:00;True|2021-10-09T09:59:47.6406300+08:00;True|2021-10-08T14:39:48.4619361+08:00;True|2021-10-08T14:36:01.1659545+08:00;True|2021-10-06T09:01:05.9377353+08:00;True|2021-10-06T08:57:36.8130340+08:00;True|2021-10-06T08:53:47.9931570+08:00;True|2021-10-06T08:53:07.5549785+08:00;True|2021-10-06T08:52:08.6104507+08:00;True|2021-10-06T08:49:14.8053023+08:00;True|2021-10-06T08:47:36.0360952+08:00;True|2021-10-06T08:22:28.0364825+08:00;True|2021-10-06T08:20:51.5362840+08:00;True|2021-10-05T18:10:54.9577316+08:00;True|2021-10-04T16:35:26.6721943+08:00;True|2021-10-04T16:33:09.3493237+08:00;True|2021-10-04T15:17:36.6753113+08:00;True|2021-10-04T15:10:32.9598486+08:00;True|2021-10-04T14:59:04.1114178+08:00;True|2021-10-04T14:43:34.1626560+08:00;True|2021-10-04T14:36:52.8196973+08:00;True|2021-10-04T14:35:41.3116464+08:00;True|2021-10-04T14:12:42.1228124+08:00;True|2021-10-04T13:55:12.1452989+08:00;True|2021-10-04T13:50:50.4368363+08:00;True|2021-10-04T13:46:49.3432327+08:00;True|2021-10-04T13:43:46.0306001+08:00;True|2021-10-04T13:42:08.4380438+08:00;True|2021-10-02T11:08:40.0958812+08:00;True|2021-09-30T15:59:05.2591927+08:00;True|2021-09-30T12:33:13.9554429+08:00;True|2021-09-27T14:41:36.1720722+08:00;False|2021-09-27T14:40:57.0056012+08:00;True|2021-09-27T09:14:46.8802018+08:00;True|2021-09-27T09:13:14.0238606+08:00;True|2021-09-27T09:06:25.4101559+08:00;True|2021-09-17T15:06:30.4485214+08:00;True|2021-09-17T11:22:12.0563828+08:00;True|2021-09-14T14:20:12.9552865+08:00;True|2021-09-14T08:55:29.2052912+08:00;True|2021-09-13T15:00:59.4781894+08:00;True|2021-09-13T14:30:21.8724741+08:00;True|2021-09-13T14:21:59.9842865+08:00;True|2021-09-13T13:55:52.5440732+08:00;True|2021-09-13T13:41:47.4713265+08:00;True|2021-09-13T13:40:32.6596823+08:00;True|2021-09-13T13:05:11.9634766+08:00;True|2021-09-13T12:56:50.3833877+08:00;True|2021-09-13T12:55:42.5423394+08:00;True|2021-09-13T12:54:14.5348970+08:00;True|2021-09-13T12:53:29.2851299+08:00;True|2021-09-13T11:30:49.4614132+08:00;True|2021-09-13T11:07:18.7614320+08:00;True|2021-09-13T10:11:54.3210837+08:00;True|2021-09-13T10:10:52.0621982+08:00;True|2021-09-13T10:07:13.0435933+08:00;True|2021-09-13T09:37:14.2422108+08:00;True|2021-09-13T09:25:23.5296138+08:00;True|2021-09-13T08:59:18.2682553+08:00;True|2021-09-13T08:57:01.7610315+08:00;True|2021-09-13T08:47:01.4215634+08:00;True|2021-09-13T08:26:28.5920671+08:00;True|2021-09-13T08:24:57.2643590+08:00;True|2021-09-10T14:51:04.7707907+08:00;True|2021-09-09T10:35:53.0372382+08:00;True|2021-09-08T14:44:54.9146584+08:00;True|2021-09-08T09:45:41.8822491+08:00;True|2021-09-08T09:27:57.1364965+08:00;True|2021-09-08T09:26:54.3164990+08:00;True|2021-09-08T09:24:27.3121015+08:00;True|2021-09-08T09:17:43.0782846+08:00;True|2021-09-08T09:16:11.6882318+08:00;True|2021-09-08T09:08:53.8744747+08:00;True|2021-09-08T09:08:46.8933620+08:00;True|2021-09-06T09:33:26.6804733+08:00;True|2021-09-03T19:10:12.7592659+08:00;True|2021-08-31T17:33:20.4862250+08:00;True|2021-08-31T17:25:33.2338034+08:00;True|2021-08-31T17:16:53.6141658+08:00;True|2021-08-31T17:05:05.8698117+08:00;True|2021-08-31T16:41:50.3822298+08:00;True|2021-08-31T16:37:22.2238663+08:00;True|2021-08-31T16:36:26.1800384+08:00;True|2021-08-31T16:28:26.1099872+08:00;True|2021-08-31T16:21:52.6418458+08:00;True|2021-08-31T16:21:43.0677604+08:00;True|2021-08-31T14:44:51.5966580+08:00;True|2021-08-31T14:23:28.5410238+08:00;True|2021-08-31T14:21:48.9261003+08:00;True|2021-08-31T14:16:21.3594227+08:00;True|2021-08-31T08:41:12.4835146+08:00;True|2021-08-31T08:39:44.8228499+08:00;True|2021-08-24T11:22:21.6358144+08:00;True|2021-08-24T11:15:14.2239037+08:00;True|2021-08-24T11:07:52.7338377+08:00;True|2021-08-24T11:05:07.1956470+08:00;True|2021-08-24T10:58:37.3560774+08:00;True|2021-08-24T10:55:25.2011361+08:00;True|2021-08-24T10:50:24.4184661+08:00;True|2021-08-24T10:40:08.9920641+08:00;True|2021-08-24T09:56:57.1366165+08:00;True|2021-08-24T09:51:03.8491425+08:00;True|2021-08-24T09:39:46.6283267+08:00;True|2021-08-24T09:34:56.0329846+08:00;True|2021-08-24T09:33:49.5616108+08:00;True|2021-08-24T09:30:11.4275137+08:00;True|2021-08-24T09:28:03.1632781+08:00;True|2021-08-24T09:20:37.9359161+08:00;True|2021-08-23T19:41:47.4759824+08:00;True|2021-08-23T19:31:57.7822004+08:00;True|2021-08-23T19:29:00.7059328+08:00;True|2021-08-23T19:27:50.7182931+08:00;True|2021-08-23T19:25:43.1081358+08:00;True|2021-08-23T19:23:31.7673811+08:00;True|2021-08-23T19:19:12.4688135+08:00;True|2021-08-23T14:33:40.0216534+08:00;True|2021-08-23T10:25:16.2368267+08:00;True|2021-08-23T08:44:53.7913522+08:00;True|2021-08-23T08:43:06.9224130+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>10/29/2021 10:13:10</publishTime>
+ <publishTime>10/26/2021 10:52:54</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>10/29/2021 10:13:10</publishTime>
+ <publishTime>10/26/2021 10:52:54</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -594,7 +594,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/modules/transfer.js">
- <publishTime>10/20/2021 10:35:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="layuiadmin/modules/user.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -633,7 +633,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/PubCustom.js">
- <publishTime>10/20/2021 22:10:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="layuiadmin/PubJs/PubCheck.js">
<publishTime>08/03/2021 10:19:55</publishTime>
@@ -651,7 +651,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>10/29/2021 09:53:04</publishTime>
+ <publishTime>10/26/2021 10:06:10</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>10/08/2021 18:47:00</publishTime>
@@ -1125,7 +1125,7 @@
<publishTime>07/07/2021 16:04:21</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/26/2021 10:06:10</publishTime>
</File>
<File Include="views/indexMenu.html">
<publishTime>10/16/2021 17:25:19</publishTime>
@@ -1134,7 +1134,7 @@
<publishTime>10/19/2021 15:51:44</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>10/21/2021 09:01:42</publishTime>
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -1185,10 +1185,10 @@
<publishTime>08/24/2021 19:07:40</publishTime>
</File>
<File Include="views/PublicPage/OrderBackInfomation.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/OrderLevInformation.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/Organizations.html">
<publishTime>10/13/2021 16:16:40</publishTime>
@@ -1197,7 +1197,7 @@
<publishTime>08/24/2021 19:08:00</publishTime>
</File>
<File Include="views/PublicPage/PeopleInformation.html">
- <publishTime>10/20/2021 19:19:11</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/ProductionOrder.html">
<publishTime>07/08/2021 20:52:36</publishTime>
@@ -1221,13 +1221,13 @@
<publishTime>08/24/2021 19:10:03</publishTime>
</File>
<File Include="views/PublicPage/SupplierInformation.html">
- <publishTime>10/20/2021 19:30:48</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/UnitInformation.html">
<publishTime>08/24/2021 19:10:55</publishTime>
</File>
<File Include="views/PublicPage/UserInformation.html">
- <publishTime>10/20/2021 18:18:39</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/PublicPage/WareHouseInformation.html">
<publishTime>10/19/2021 10:51:45</publishTime>
@@ -1320,7 +1320,7 @@
<publishTime>03/23/2021 14:14:38</publishTime>
</File>
<File Include="views/test/testRenderAutomationList.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/user/administrators/adminform.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1404,7 +1404,10 @@
<publishTime>08/10/2021 14:32:09</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/26/2021 10:06:10</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ClassTimePrj.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
<publishTime>09/10/2021 09:46:57</publishTime>
@@ -1423,12 +1426,6 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
<publishTime>10/13/2021 10:00:32</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1452,10 +1449,13 @@
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/26/2021 10:06:10</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrj.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍝佽川绠＄悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
<publishTime>06/10/2021 11:21:39</publishTime>
@@ -1482,13 +1482,13 @@
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1497,7 +1497,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
<publishTime>09/13/2021 18:04:58</publishTime>
@@ -1527,31 +1527,25 @@
<publishTime>10/22/2021 10:08:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipType.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipTypeEdit.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
<publishTime>10/15/2021 08:23:50</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>08/25/2021 14:22:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
<publishTime>08/24/2021 19:33:39</publishTime>
@@ -1560,13 +1554,13 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>08/25/2021 14:22:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
<publishTime>08/24/2021 19:33:39</publishTime>
@@ -1575,10 +1569,10 @@
<publishTime>05/24/2021 10:08:23</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1590,7 +1584,7 @@
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1605,7 +1599,7 @@
<publishTime>10/20/2021 22:10:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_EquipTypeBill.aspx">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Department_Edit.aspx">
<publishTime>10/04/2021 00:08:22</publishTime>
@@ -1665,7 +1659,7 @@
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1677,7 +1671,7 @@
<publishTime>09/10/2021 09:46:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
- <publishTime>10/20/2021 22:10:58</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1686,7 +1680,7 @@
<publishTime>10/04/2021 00:08:22</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1709,6 +1703,12 @@
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Proc.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ProcList.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_Table.html">
<publishTime>10/26/2021 10:06:10</publishTime>
</File>
@@ -1726,6 +1726,12 @@
</File>
<File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html">
<publishTime>10/26/2021 10:06:10</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_View.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鏁版嵁瀛楀吀/Xt_DataDictionary_ViewList.html">
+ <publishTime>10/26/2021 08:42:27</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
<publishTime>10/11/2021 15:16:45</publishTime>
@@ -1788,7 +1794,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
<publishTime>10/11/2021 15:16:08</publishTime>
@@ -1800,7 +1806,7 @@
<publishTime>10/11/2021 15:16:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
- <publishTime>10/27/2021 10:08:57</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
<publishTime>10/11/2021 15:15:34</publishTime>
@@ -1877,6 +1883,15 @@
<File Include="views/妯℃不鍏风鐞�/妯″叿瀵垮懡璋冩暣鍗�/Sc_MouldLifeChangeBill_PDA.html">
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html">
+ <publishTime>10/27/2021 13:31:43</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html">
+ <publishTime>10/26/2021 09:34:03</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html">
+ <publishTime>10/26/2021 09:34:02</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html">
<publishTime>10/15/2021 08:23:50</publishTime>
</File>
@@ -1885,6 +1900,9 @@
</File>
<File Include="views/妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html">
<publishTime>07/02/2021 16:55:33</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html">
+ <publishTime>10/27/2021 14:10:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
<publishTime>10/08/2021 19:44:41</publishTime>
@@ -1896,7 +1914,7 @@
<publishTime>10/22/2021 18:51:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
<publishTime>07/23/2021 13:20:30</publishTime>
@@ -2025,7 +2043,7 @@
<publishTime>10/18/2021 08:39:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>10/29/2021 10:01:27</publishTime>
+ <publishTime>10/22/2021 17:29:39</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
<publishTime>10/22/2021 19:01:29</publishTime>
@@ -2058,7 +2076,7 @@
<publishTime>10/22/2021 18:51:27</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:18</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
<publishTime>07/23/2021 13:20:30</publishTime>
@@ -2115,7 +2133,7 @@
<publishTime>10/18/2021 08:39:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
- <publishTime>10/29/2021 10:01:27</publishTime>
+ <publishTime>10/22/2021 17:29:39</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
<publishTime>10/22/2021 19:01:29</publishTime>
@@ -2154,7 +2172,7 @@
<publishTime>10/18/2021 08:39:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
<publishTime>10/19/2021 15:51:44</publishTime>
@@ -2370,7 +2388,7 @@
<publishTime>10/19/2021 21:30:51</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">
- <publishTime>10/29/2021 10:13:03</publishTime>
+ <publishTime>10/22/2021 17:29:39</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/绯荤粺鍙傛暟绠＄悊/Xt_SystemParameterList.html">
<publishTime>07/02/2021 16:55:33</publishTime>
@@ -2409,7 +2427,7 @@
<publishTime>07/01/2021 17:37:53</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/22/2021 19:14:45</publishTime>
@@ -2505,7 +2523,7 @@
<publishTime>08/22/2021 08:56:48</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EqpRepairCheckBillList.html">
- <publishTime>10/22/2021 10:08:27</publishTime>
+ <publishTime>10/22/2021 08:47:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
<publishTime>10/22/2021 19:14:45</publishTime>
@@ -2877,7 +2895,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/29/2021 10:13:15</publishTime>
+ <publishTime>10/26/2021 10:52:59</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index def2eb3..7034261 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -116,13 +116,9 @@
<Content Include="views\PublicPage\PeopleInformation.html" />
<Content Include="views\ReportHtml.html" />
<Content Include="views\test\testRenderAutomationList.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Xt_ORGANIZATIONSList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderBackInfo.html" />
- <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_OrderLev.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipTypeEdit.html" />
@@ -619,11 +615,14 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍏ュ簱鍗昞Sc_MouldRepairInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鏀瑰埗鍑哄簱鍗昞Sc_MouldRepairOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇棰嗙敤鍗昞Sc_MouldProdOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿閲囪喘鍏ュ簱鍗昞Sc_MouldProdInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldMoveStockStepInBillList.html" />
@@ -639,7 +638,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
- <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鎶ュ簾鍏ュ簱鍗昞Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList.html" />
@@ -668,6 +667,9 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldOtherOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧淇濆吇璁板綍鍗昞Sb_EquipMaintainBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧鐐规璁板綍鍗昞Sb_EquipDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱璁惧缁翠慨璁板綍鍗昞Sb_EquipRepairWorkBill_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ崟\WW__Add_EntrustWorkOrderBill.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭娲惧伐鍗昞WW_AddEntrustProcSendWork.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝姹囨姤鍗昞WW_Add_EntrustProcessReport.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8c20031..a1fd68e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,10 +5,10 @@
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
- //var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
+ var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
//var WEBURL = "http://192.168.1.253:8080/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ唴缃�
//var WEBURL = "http://220.189.218.154:8092/API/"; //涓镐簳鍥涚淮灏旀湇鍔″櫒
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 7659080..75987e8 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -741,8 +741,6 @@
<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ClassTimePrjSub.html">鏍哥畻璁板綍</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">瀹㈡埛鍒楄〃</a></dd>
<dd><a lay-href="鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">渚涘簲鍟嗗垪琛�</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">璁㈠崟绛夌骇</a></dd>
- <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">璁㈠崟鍙嶉鐘舵��</a></dd>
</dl>
</dd>
<dd>
@@ -801,7 +799,6 @@
<dl class="layui-nav-child">
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.html">鐢ㄦ埛鍒楄〃</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserGroupList.html">瑙掕壊鍒楄〃</a></dd>
- <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserSuplies.html">鐢ㄦ埛鍏宠仈渚涘簲鍟�</a></dd>
<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
<dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
</dl>
diff --git a/WebTM/views/index_Mobile.html b/WebTM/views/index_Mobile.html
index c97a742..80cb672 100644
--- a/WebTM/views/index_Mobile.html
+++ b/WebTM/views/index_Mobile.html
@@ -183,27 +183,27 @@
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏风敓浜ч鐢ㄥ崟null
+ 妯″叿鐢熶骇棰嗙敤鍗�
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏风敓浜ч��搴撳崟null
+ 妯″叿鐢熶骇閫�搴撳崟
</a>
</dd>
<dd>
- <a lay-href="" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏峰鐞嗗嚭搴撳崟null
+ 妯℃不鍏峰鐞嗗嚭搴撳崟
</a>
</dd>
<dd>
- <a lay-href="妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鎶ュ簾鍏ュ簱鍗�/Sc_MouldScrapInBill_PDA.html" style="color: aqua;">
<img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
- 妯℃不鍏锋姤搴熷叆搴撳崟
+ 妯″叿鎶ュ簾鍏ュ簱鍗�
</a>
</dd>
<dd>
@@ -236,6 +236,24 @@
妯″叿澶勭悊鍑哄簱鍗�
</a>
</dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍏ュ簱鍗�/Sc_MouldRepairInBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿鏀瑰埗鍏ュ簱鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿鏀瑰埗鍑哄簱鍗�/Sc_MouldRepairOutBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿鏀瑰埗鍑哄簱鍗�
+ </a>
+ </dd>
+ <dd>
+ <a lay-href="妯℃不鍏风鐞�/妯″叿閲囪喘鍏ュ簱鍗�/Sc_MouldProdInBill_PDA.html" style="color: aqua;">
+ <img src="../layuiadmin/myicon/鍗曟嵁褰曞埗.svg" alt="鍗曟嵁褰曞埗" style="width:25px;height:25px;margin-right: 5px;" />
+ 妯″叿閲囪喘鍏ュ簱鍗�
+ </a>
+ </dd>
</dl>
</li>
<!-- 浠撳偍鏉＄爜绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
index 95fc0e8..e0d4d0b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_ClassTimePrj.html"
@@ -42,7 +42,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
- <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="z" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HGroup-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -241,15 +241,16 @@
$("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
}
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HItemID": data.HItemID
+ "HNumber": data.HNumber
+ , "HItemID": data.HItemID
, "HName": data.鏍哥畻鏂瑰紡鍚嶇О
, "HNumber": data.鏍哥畻鏂瑰紡浠ｇ爜
, "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
+ , "HDeptID": data.閮ㄩ棬浠ｇ爜
, "hparentName": data.缁勫悕绉�
, "hparentid": data.缁勪唬鐮�
, "HGroupName": data.鐝粍鍚嶇О
- , "HGroupID": data.HGroupID
+ , "HGroupID": data.鐝粍浠ｇ爜
, "HStopflag": data.HStopflag
, "HRemark": data.HRemark
});
@@ -324,6 +325,7 @@
}
$("#HDeptName").val(checkStatus.data[0].HName);
$("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptNumber").val(checkStatus.data[0].HNumber);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
deleted file mode 100644
index 893c39c..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderBackInfo.html"
+++ /dev/null
@@ -1,263 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title>鏂板/缂栬緫璁㈠崟鍙嶉鐘舵��</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css">
- .layui-form-label {
- width: 85px;
- }
- </style>
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
- </div>
-
- </div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佷唬鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
- <input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵�佸悕绉�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </form>
- </div>
- </div>
- </div>
- </div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script>
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var TagParentId = params[params[2]]; //鐖剁骇ID
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , element = layui.element;
-
- //甯歌鐢ㄦ硶
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //#region 澶撮儴宸ュ叿鏍忎簨浠�
-
- //娓呴櫎
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var ModRightNameAdd = 'Gy_RepairType_Edit';
- var user = sessionStorage["HUserName"];
- var arr = new Array();
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- data.field.HItemID = hID == "" ? 0 : hID;
-
- data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
- if (HType == "Modify") {
-
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderBackInfo/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- Pub_Close(1);
- })
- //#endregion
-
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
-
- if (HType == "Modify") {
- $.ajax({
- url: GetWEBURL() + "/Gy_OrderBackInfo/xg",
- //url: "http://localhost:12761/Gy_Department/xg",
- type: "GET",
- data: {
- "HInterID": hID
- },
- success: function (d) {
- console.log(d);
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HYX").val(d.data[0].HYX);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
- }
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderLev.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderLev.html"
deleted file mode 100644
index 55f5c4f..0000000
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_OrderLev.html"
+++ /dev/null
@@ -1,269 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8" />
- <title>鏂板/缂栬緫璁㈠崟绛夌骇</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <style type="text/css">
- .layui-form-label {
- width: 85px;
- }
- </style>
-</head>
-<body>
-
- <div id="layout1" class="layui-fluid">
- <div class="layui-row layui-col-space15">
- <div class="layui-col-md12">
- <div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
- </div>
-
- </div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浠ｇ爜</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
- <input id="HItemID" name="HItemID" type="hidden" />
- <input id="HParentID" name="HParentID" type="hidden" />
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍚嶇О</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HName" lay-verify="HName" id="HName">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍔╄鐮�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">浼樺厛绾�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HYX" lay-verify="HYX" id="HYX">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- </form>
- </div>
- </div>
- </div>
- </div>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/PubCustom.js"></script>
- <script>
- //鑾峰彇鍙傛暟
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
-
- var params = getUrlVars();
- var hID = params[params[0]];//缂栬緫鏌ョ湅
- var HType = params[params[1]]; //鍗曟嵁鐘舵��
- var TagParentId = params[params[2]]; //鐖剁骇ID
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , laydate = layui.laydate
- , element = layui.element;
-
- //甯歌鐢ㄦ硶
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- //if (sessionStorage.login != "login") {
- // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- // }, function () { window.location.href = "../../user/login.html"; });
- //}
-
- //#region 澶撮儴宸ュ叿鏍忎簨浠�
-
- //娓呴櫎
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
- //淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
- var ModRightNameAdd = 'Gy_RepairType_Edit';
- var user = sessionStorage["HUserName"];
- var arr = new Array();
- var isEndCheck = document.getElementById("HStopflag").checked;
- data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-
- data.field.HItemID = hID == "" ? 0 : hID;
-
- data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
- if (HType == "Modify") {
-
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderLev/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- else {
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Gy_OrderLev/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "oMain": oMain },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
- });
- }
- else {
-
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
- }
- layer.closeAll("loading");
- },
- error: function (err) {
-
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
- }
- });
- }
- });
- //閫�鍑烘寜閽�
- form.on('submit(Exit)', function () {
- Pub_Close(1);
- })
- //#endregion
-
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
-
- if (HType == "Modify") {
- $.ajax({
- url: GetWEBURL() + "/Gy_OrderLev/xg",
- //url: "http://localhost:12761/Gy_Department/xg",
- type: "GET",
- data: {
- "HInterID": hID
- },
- success: function (d) {
- console.log(d);
- ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
- $("#HNumber").val(d.data[0].HNumber);
- $("#HName").val(d.data[0].HName);
- $("#HHelpCode").val(d.data[0].HHelpCode);
- $("#HRemark").val(d.data[0].HRemark);
- $("#HYX").val(d.data[0].HYX);
- $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
- layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
- //table.reload(layTableId, {
- // data: ajaxReturnData
- //});
- }
-
- });
- }
-
- //鐩戝惉鎻愪氦
- form.verify({
- numberOrEmpty: function (value, item) {
- // if (value != '') {
- if (!/^\d+$/.test(value)) {
- return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
- }
- //}
- }
- });
- });
- </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
index 1492fed..8c43fb8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ClassTimePrj.html"
@@ -81,7 +81,6 @@
, util = layui.util
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -159,14 +158,11 @@
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '鏍哥畻鏂瑰紡浠ｇ爜', title: '鏍哥畻鏂瑰紡浠ｇ爜' }
, { field: '鏍哥畻鏂瑰紡鍚嶇О', title: '鏍哥畻鏂瑰紡鍚嶇О' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
- , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
+ //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
, { field: '鐝粍鍚嶇О', title: '鐝粍' }
+ , { field: '缁勫悕绉�', title: '鎵�灞炵粍' }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
, { field: '澶囨敞', title: '澶囨敞' }
- , { field: '缁勪唬鐮�', title: '缁勪唬鐮�' }
- , { field: '缁勫悕绉�', title: '缁勫悕绉�' }
]]
};
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
index 3ae9497..3348dba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.html"
@@ -124,7 +124,6 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 鍒濆鍖栬〃鏍�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 8e4d432..d73c0f8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -77,7 +77,7 @@
, laydate = layui.laydate
var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
var option = [];
- var Organization = sessionStorage["OrganizationID"];
+
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 04d7a6a..5d5fd61 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -78,7 +78,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index f8e009d..1a37772 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -94,7 +94,6 @@
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_OrderBackInfo.html"
deleted file mode 100644
index 5a4af47..0000000
--- "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_OrderBackInfo.html"
+++ /dev/null
@@ -1,439 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁㈠崟鍙嶉鐘舵��</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/treeTable.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
-
-</head>
-<body>
- <div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍙嶉鐘舵�佷唬鐮�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍙嶉鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-
- </div>
- </script>
- </form>
- </div>
- </div>
- </div>
- </div>
-
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
- <script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
- // #region 鍏敤鍙橀噺
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , util = layui.util
- , tree = layui.tree
- var sWhere = "";
- var option = [];
- //#endregion
-
- //鍒濆鍖栬〃鏍�
- set_ClearBill();
-
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //鏂板
- form.on('submit(btnAdd)', function (obj) {
- set_AddNew(obj);
- })
-
- //淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- set_ShowBill(data);
- });
-
- //鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- set_DeleteBill(obj);
- });
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and 鍙嶉鐘舵�佷唬鐮� like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 鍙嶉鐘舵�佸悕绉� like '%" + HName + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
-
-
-
- //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
- //鏌ヨ鏍戠姸鏁版嵁
- function getData(sWhere) {
- var treeData;
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- async: false,
- success: function (result) {
- console.log(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.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- if (parent) {
- if (!Array.isArray(parent.children)) parent.children = [];
- parent.children.push(it);
- } else {
- treeData.push(it)
- }
- })
- return treeData;
- }
-
- //鍒濆鍖栬〃鏍�
- function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
- }
-
- //鏍戝瀷鐐瑰嚮鏌ヨ
- function TreeClick(obj) {
- //鐐瑰嚮楂樺厜
- if (obj.data.id !== treeCkData.id) {
- $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = obj.data;
- TagId = obj.data.id;
- TagParentId = obj.data.ParentID;
- }
- else {
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = { id: 0 };
- TagId = "";
- TagParentId = "";
- }
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/cx',
- type: "GET",
- data: { "HInterID": obj.data.id },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- //, { field: 'ParentIDParentID', title: 'ParentID', sort: true, hide: true }
- , { field: '鍙嶉鐘舵�佷唬鐮�', title: '鍙嶉鐘舵�佷唬鐮�' }
- , { field: '鍙嶉鐘舵�佸悕绉�', title: '鍙嶉鐘舵��' }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
- ]]
- };
- }
-
- //鏌ヨ
- function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鏂板
- function set_AddNew(obj) {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板璁㈠崟鍙嶉鐘舵��',
- closeBtn: 1,
- shift: 2,
- area: ['50%', '50%'],
- maxmin: true,
- content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- }
-
- //淇敼
- function set_ShowBill(data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- //TagParentId = data[0].ParentID.toString();
- TagParentId = 0;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['55%', '55%']
- , title: '缂栬緫璁㈠崟鍙嶉鐘舵��'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //鍒犻櫎
- function set_DeleteBill(obj) {
- var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderBackInfo/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //#endregion
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- });
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
- </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/Gy_OrderLev.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_OrderLev.html"
deleted file mode 100644
index 6dd89fb..0000000
--- "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_OrderLev.html"
+++ /dev/null
@@ -1,439 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>璁㈠崟绛夌骇</title>
- <meta name="renderer" content="webkit">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/treeTable.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
- <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
-
-</head>
-<body>
- <div class="layui-fluid">
- <div class="layui-col-md12">
- <div class="layui-card" style="padding: 1px">
- <div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-collapse">
- <div class="layui-colla-item">
- <div class="layui-colla-title layui-inline">
- <div class="layui-inline">
- <span></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟绛夌骇浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">璁㈠崟绛夌骇</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HName" id="HName">
- </div>
- </div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-
- </div>
- </div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-
- </div>
- </script>
- </form>
- </div>
- </div>
- </div>
- </div>
-
- <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
- <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-
- <script>
- var treeCkData = { id: 0 };
- var TagId = "";
- var TagParentId = "";
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
- // #region 鍏敤鍙橀噺
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
- , util = layui.util
- , tree = layui.tree
- var sWhere = "";
- var option = [];
- //#endregion
-
- //鍒濆鍖栬〃鏍�
- set_ClearBill();
-
- //#endregion
-
- //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
-
- //鏂板
- form.on('submit(btnAdd)', function (obj) {
- set_AddNew(obj);
- })
-
- //淇敼鎸夐挳
- form.on('submit(btnModify)', function (data) {
- set_ShowBill(data);
- });
-
- //鍒犻櫎
- form.on('submit(btndelete)', function (obj) {
- set_DeleteBill(obj);
- });
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and 璁㈠崟绛夌骇浠ｇ爜 like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and 璁㈠崟绛夌骇 like '%" + HName + "%'";
- }
- get_Display(sWhere);
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
-
-
-
- //#endregion
-
- //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
-
- //鏌ヨ鏍戠姸鏁版嵁
- function getData(sWhere) {
- var treeData;
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/LoadTree',
- type: "GET",
- data: { "sWhere": sWhere },
- async: false,
- success: function (result) {
- console.log(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.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
- if (parent) {
- if (!Array.isArray(parent.children)) parent.children = [];
- parent.children.push(it);
- } else {
- treeData.push(it)
- }
- })
- return treeData;
- }
-
- //鍒濆鍖栬〃鏍�
- function set_ClearBill() {
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
-
- //鏌ヨ
- get_Display(sWhere);
- }
-
- //鏍戝瀷鐐瑰嚮鏌ヨ
- function TreeClick(obj) {
- //鐐瑰嚮楂樺厜
- if (obj.data.id !== treeCkData.id) {
- $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = obj.data;
- TagId = obj.data.id;
- TagParentId = obj.data.ParentID;
- }
- else {
- $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
- treeCkData = { id: 0 };
- TagId = "";
- TagParentId = "";
- }
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/cx',
- type: "GET",
- data: { "HInterID": obj.data.id },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
- //, { field: 'ParentIDParentID', title: 'ParentID', sort: true, hide: true }
- , { field: '璁㈠崟绛夌骇浠ｇ爜', title: '璁㈠崟绛夌骇浠ｇ爜' }
- , { field: '璁㈠崟绛夌骇', title: '璁㈠崟绛夌骇' }
- , { field: '浼樺厛绾�', title: '浼樺厛绾�' }
- , { field: '绛夌骇', title: '绛夌骇' }
- , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- , { field: '澶囨敞', title: '澶囨敞' }
- , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
- ]]
- };
- }
-
- //鏌ヨ
- function get_Display(sWhere) {
- var ajaxLoad = layer.load();
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鏂板
- function set_AddNew(obj) {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板璁㈠崟绛夌骇',
- closeBtn: 1,
- shift: 2,
- area: ['50%', '50%'],
- maxmin: true,
- content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + TagId + ''],
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
- }
-
- //淇敼
- function set_ShowBill(data) {
- if (TagId != "") {
- layer.open({
- type: 2
- , area: ['50%', '50%']
- , title: '缂栬緫璁㈠崟绛夌骇'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- }
- else {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].HItemID.toString();
- //TagParentId = data[0].ParentID.toString();
- TagParentId = 0;
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['55%', '55%']
- , title: '缂栬緫璁㈠崟绛夌骇'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderLev.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //鍒犻櫎
- function set_DeleteBill(obj) {
- var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
- if (TagId != "") {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
- // , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- var layEvent = checkStatus.event;
- if (checkStatus.data.length === 1) {
- layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
- btn: ['纭畾', '鍙栨秷'] //鎸夐挳
- , yes: function (index, layero) {
-
- $.ajax({
- url: GetWEBURL() + '/Gy_OrderLev/Delete_Json',
- type: "GET",
- //async: true,
- data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- //閲嶈浇tree
- tree.reload('treeDepartment', {});
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }
- })
- }
- });
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- }
- }
-
- //#endregion
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- });
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
- </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/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index a2387a7..6d6da9b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -342,7 +342,7 @@
}
});
}
-
+
//鏂板
function set_AddNew(obj)
{
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 6e2f4eb..60833c4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -107,7 +107,6 @@
, util = layui.util
, tree = layui.tree
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
$.ajax({
url: GetWEBURL() + '/Gy_Unit/LoadTree',
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index bb9db44..5651949 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -85,7 +85,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -170,7 +169,7 @@
}
//#endregion
-
+
//#region 鏌ヨ
function get_Display(sWhere) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
index dbc04db..df458ea 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Xt_ORGANIZATIONSList.html"
@@ -80,7 +80,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
var sWhere = "";
- var Organization = sessionStorage["OrganizationID"];
+
//鍒濆鍖栫晫闈�
set_ClearBill();
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 2c334bf..f65f189 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -84,7 +84,6 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index 524c6be..9940913 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -82,7 +82,6 @@
, laydate = layui.laydate
var sWhere = "";
var option = [];
- var Organization = sessionStorage["OrganizationID"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
index 5bce2e2..5069e90 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\345\244\204\347\220\206\345\207\272\345\272\223\345\215\225/Sc_MouldScrapOutBill_PDA.html"
@@ -154,7 +154,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -340,7 +340,7 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID":data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
@@ -392,17 +392,16 @@
layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HSPID").val()) {
- layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- //url: GetWEBURL() + "/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
- url:"http://localhost:12761/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
+ url: GetWEBURL() + "/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
+ //url:"http://localhost:12761/Sc_MouldScrapOutBill/MouldScrapOutBill_Save",
async: true,
data: { "sMainSub": sMainSub },
dataType: "json",
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
similarity index 98%
rename from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
rename to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
index ac1eb64..267c793 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\212\245\345\272\237\345\205\245\345\272\223\345\215\225/Sc_MouldScrapInBill_PDA.html"
@@ -168,7 +168,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -358,7 +358,7 @@
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID": data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
@@ -395,6 +395,10 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var oMain = JSON.stringify(data.field);
//var oMain = data.field;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
similarity index 82%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
index ac1eb64..6e1a1c0 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\205\245\345\272\223\345\215\225/Sc_MouldRepairInBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;"value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,7 +139,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +148,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +163,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +172,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +244,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +271,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +300,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +314,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3826' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +341,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +370,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +380,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairInBill/MouldRepairInBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +428,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -494,22 +465,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +486,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +497,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -560,11 +516,6 @@
function GetHWorkerValue(obj) {
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
- }
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
similarity index 82%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
index ac1eb64..478c4f4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\346\224\271\345\210\266\345\207\272\345\272\223\345\215\225/Sc_MouldRepairOutBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鏀瑰埗鍑哄簱鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;"value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,7 +139,7 @@
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +148,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +163,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +172,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +244,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +271,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +300,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +314,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3825' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +341,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +370,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +380,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairOutBill/MouldRepairOutBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +428,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -494,22 +465,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +486,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +497,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -560,11 +516,6 @@
function GetHWorkerValue(obj) {
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
- }
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
index 0978a08..2a985cc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\200\200\345\272\223\345\215\225/Sc_MouldProdBackBill_PDA.html"
@@ -154,25 +154,25 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">褰撳墠鍣ㄥ叿瑙勬牸:</label>
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">璁捐瀵垮懡:</label>
+ <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HDesignLife" id="HDesignLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">绱浣跨敤瀵垮懡:</label>
+ <label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLastUseLife" id="HLastUseLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -181,32 +181,7 @@
<input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鏂拌鏍�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarNewSpec" id="HBarNewSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏈浣跨敤瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HNowUseLife" id="HNowUseLife" class="layui-input" onclick="onchange">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鏂板鍛�:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HNewLife" id="HNewLife" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">閫�搴撶被鍨�:</label>
- <select name="HBackFlag" id="HBackFlag">
- <option value="姝ｅ父浣跨敤">姝ｅ父浣跨敤</option>
- <option value="鎶ュ簾鍏ュ簱">鎶ュ簾鍏ュ簱</option>
- </select>
- </div>
- </div>
+ </div>
</div>
</div>
<div class="layui-tab-item">
@@ -363,16 +338,15 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBarName": data.HMouldTypeName,
+ "HMaterID": data.hinterid,
+ "HBarName": data.HName,
"HBarSpec": data.HModel,
- "HBarNewSpec": data.HNewModel,
- "HDesignLife": data.HDesignLife,
- "HLastUseLife": data.HLastUseLife,
+ "HBarModel": data.HModel2,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
@@ -403,12 +377,7 @@
})
- //鏈浣跨敤鏂囨湰妗嗗�兼敼鍙樺悗鏂规硶
- $('#HNowUseLife').on('change', function () {
- //var HDesignLife = $('#HDesignLife').val();
- //var HNowUseLife = $('#HNowUseLife').val();
- $("#HLeaveLife").val($('#HDesignLife').val() - $('#HNowUseLife').val());
- })
+
//鎻愪氦
form.on('submit(Saver)', function (data) {
@@ -420,9 +389,8 @@
layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- if (!$("#HSPID").val()) {
- layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
}
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
index 3c49b0d..04ef312 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\224\237\344\272\247\351\242\206\347\224\250\345\215\225/Sc_MouldProdOutBill_PDA.html"
@@ -154,7 +154,7 @@
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -167,18 +167,6 @@
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">璁捐瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HDesignLife" id="HDesignLife" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">绱浣跨敤瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HUseLife" id="HUseLife" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -345,17 +333,16 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode, "HInterID": HInterID, "HWHID": HWHID, "HSPID": HSPID },
+ data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- //"HMouldID": data.HMaterIDField,
- "HBarName": data.HMouldTypeName,
+ "HMaterID": data.hinterid,
+ "HBarName": data.HName,
"HBarSpec": data.HModel,
- "HDesignLife": data.HDesignLife,
- "HUseLife": data.HUseLife,
- "HLeaveLife": data.HDesignLife
+ "HBarModel": data.HModel2,
+ "HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
@@ -386,18 +373,17 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {
- //if (!$("#HBarCode").val()) {
- // layer.msg("璇锋壂鎻忔ā娌诲叿鏉＄爜!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
- //if (!$("#HWHID").val()) {
- // layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
- //if (!$("#HSPID").val()) {
- // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return;
- //}
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainSub = JSON.stringify(data.field);
//var sMainSub = { "HBarCode": "X60201609060002", "HWHName": "浜屽巶浜旈噾濉戣兌浠撳簱", "HWHID": "189470", "HSPName": "A1 - 2", "HSPID": "100228", "HBillNo": "MJLY00000091", "HInterID": "147", "HDate": "2021 - 08 - 02 15: 31: 41", "HDeptName": "宸ョ▼閮�", "HDeptID": "121472", "HManagerName": "Admin", "HManagerID": "001", "HBarName": "椤舵潌", "HMouldID": "", "HBarSpec": "16156 - 8", "HBarModel": "16156 - 8", "HQty": "1", "HLeaveLife": "0", "HMaker": "Admin", "HMakeDate": "2021 - 08 - 02 15: 31: 41", "HUpDater": "", "HUpDateDate": "", "HChecker": "", "HCheckDate": "", "HDeleteMan": "", "HDeleteDate": "", "lngBillKey": "", "lngBillSubKey": "" };
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
similarity index 86%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
index ac1eb64..ba8f3b9 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\351\207\207\350\264\255\345\205\245\345\272\223\345\215\225/Sc_MouldProdInBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�/div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -97,16 +93,6 @@
<div class="layui-tab-item layui-show">
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
<div class="layui-input-block">
@@ -122,13 +108,11 @@
<div class="layui-input-block">
<input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
<input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;" value="0">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -152,10 +136,20 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">寰�鏉ュ崟浣�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSup" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">鎿嶄綔鍛�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input">
@@ -164,11 +158,13 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -177,8 +173,6 @@
<input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -188,7 +182,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
<div class="layui-inline">
@@ -260,8 +254,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,7 +281,7 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
@@ -316,15 +310,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,18 +324,24 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3831' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
var HBarCode = $('#HBarCode').val();
+ var HInterID = $('#HInterID').val();
+ var HWHID = $('#HWHID').val();
+ var HSPID = $('#HSPID').val();
+ if (HSPID == "") {
+ HSPID = 0;
+ }
if (event.keyCode == 13) {
if (!HBarCode) {
layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒")
@@ -353,21 +351,20 @@
$.ajax({
url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
- data: { "HBarCode": HBarCode },
+ data: { "HBarCode": HBarCode},
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HMaterID":data.hinterid,
"HBarName": data.HName,
"HBarSpec": data.HModel,
"HBarModel": data.HModel2,
- "HQty": 1,
"HLeaveLife": data.HLeaveLife
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +380,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +390,37 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忓櫒鍏锋潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HWHID").val()) {
+ layer.msg("璇烽�夋嫨浠撳簱!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ //if (!$("#HSPID").val()) {
+ // layer.msg("璇烽�夋嫨浠撲綅!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return;
+ //}
+ if ($("#HSPID").val() == "" || $("#HSPID").val() == null) {
+ data.field.HSPID = "0";//搴撲綅
+ }
+
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
+ //console.log(sMainSub);
+ //return false;
+
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldProdInBill/MouldProdInBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -433,32 +438,8 @@
});
});
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
@@ -472,6 +453,23 @@
area: ['80%', '80%'],
maxmin: true,
content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
+ //寰�鏉ュ崟浣嶅脊绐�
+ form.on('submit(HSup)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '寰�鏉ュ崟浣嶅垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes'],
cancel: function (index, layero) {
}
});
@@ -494,22 +492,6 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
- cancel: function (index, layero) {
- }
- });
- });
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +513,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +524,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,11 +544,12 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖寰�鏉ュ崟浣�
+ function GetHSupValue(obj) {
+ $("#HSupName").val(obj[0].HName);
+ $("#HSupID").val(obj[0].HItemID);
}
+
//浠撳簱
function GetHWHValue(obj) {
$("#HWHName").val(obj[0].HName);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
index 66cfa22..2c4fdf7 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldDotCheckBill_PDA.html"
@@ -329,7 +329,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
@@ -396,7 +396,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMoudlCheckBillList_PDA",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
+ url: GetWEBURL() + "/Sb_EquipDotCheckBill/savebill",//Mj_PDA_MoudlCheckBill/SaveGetMoudlCheckBillList
//url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
async: true,
data: { "msg": oMain },
@@ -444,7 +444,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
index 2734a12..36e8dc3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\202\271\346\243\200\344\277\235\345\205\273/Sc_MouldMaintainBill_PDA.html"
@@ -360,7 +360,7 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MouldMaintainBill/txtHBarCodeMaintain_KeyDown",
+ url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 7b65dc9..17ee660 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -120,20 +120,20 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
</button>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍣ㄥ叿鍒嗙被</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -143,7 +143,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍗曚綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -167,7 +167,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浣跨敤閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 80px;">
- <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -179,7 +179,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">渚涘簲鍟�</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -197,7 +197,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撳簱</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -213,7 +213,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿浠撲綅</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
@@ -430,43 +430,6 @@
form.on('submit(btnSave)', function (data) {//鎻愪氦
set_btnSave(data);
})
-
- //瀵瑰簲Erp鐗╂枡
- form.on('submit(btnHMaterList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鐗╂枡鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/PartInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HMaterID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
- });
//妯″叿鍒嗙被
form.on('submit(btnHMouleList)', function () {
@@ -870,8 +833,8 @@
$("#HSubjoin2").val(d.data[0].杈呭姪灞炴��2);
$("#HPICNo").val(d.data[0].鍥惧彿);
$("#HWorkMaterModel").val(d.data[0].鐢熶骇浜у搧鍨嬪彿);
- $("#HMaterID").val(d.data[0].HMaterID);
- $("#HMaterNumber").val(d.data[0].瀵瑰簲ERP鐗╂枡缂栫爜);
+ //$("#HMaterID").val(d.data[0].HMaterID);
+ //$("#HMaterNumber").val(d.data[0].HMaterNumber);
$("#HMouleTypeID").val(d.data[0].HMouldTypeID);
$("#HMouleTypeName").val(d.data[0].妯″叿鍝佺被);
$("#HUnitID").val(d.data[0].HUnitID);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 79964b7..f08d8fc 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -158,7 +158,6 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿' }
, { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿' }
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О' }
, { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿' }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
similarity index 81%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
index ac1eb64..7d7cfe8 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\344\277\235\345\205\273\350\256\260\345\275\225\345\215\225/Sb_EquipMaintainBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>璁惧缁翠慨璁板綍鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧缁翠慨璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3901' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID":data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarModel": data.HModel2
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sb_EquipMaintainBill/EquipMaintainBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
similarity index 81%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
index ac1eb64..7b7c88a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\202\271\346\243\200\350\256\260\345\275\225\345\215\225/Sb_EquipDotCheckBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>璁惧鐐规璁板綍鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧鐐规璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3903' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID":data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarModel": data.HModel2
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
similarity index 81%
copy from "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
copy to "WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
index ac1eb64..c483f12 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldScrapInBill_PDA.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\350\256\276\345\244\207\347\273\264\344\277\256\350\256\260\345\275\225\345\215\225/Sb_EquipRepairWorkBill_PDA.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>鎶ュ簾鍏ュ簱鍗�</title>
+ <title>璁惧缁翠慨璁板綍鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -46,27 +46,23 @@
.layui-input {
width: 93%;
}
-
.layui-inline, img {
display: block;
vertical-align: middle
}
-
.layui-input, .layui-textarea {
display: inline-block;
width: 100%;
padding-left: 10px;
}
-
+
.laydate-time-list ol {
overflow-x: hidden !important;
overflow-y: auto !important;
}
-
.layui-form-label {
padding: 9px 5px;
}
-
.layui-input-block {
margin-left: 85px;
min-height: 36px;
@@ -79,12 +75,12 @@
<div class="layui-card" style="padding: 15px;background-color: #efefef;">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="formData" id="formData" style="background-color:white;">
- <div class="maintitle">鎶ュ簾鍏ュ簱鍗�</div>
+ <div class="maintitle">璁惧缁翠慨璁板綍鍗�</div>
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
- <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鍣ㄥ叿鏉＄爜</label>
+ <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>璁惧鏉＄爜</label>
<div class="layui-input-block" style="margin-left: 100px;width:46%;">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
+ <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -98,37 +94,23 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鎶ュ簾鍘熷洜:</label>
- <div class="layui-input-block">
- <input type="text" name="HScrapReasonName" id="HScrapReasonName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HScrapReasonID" id="HScrapReasonID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ScrapReason" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨寮�濮�:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairBeginDate" id="HRepairBeginDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撳簱:</label>
- <div class="layui-input-block">
- <input type="text" name="HWHName" id="HWHName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HWHID" id="HWHID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Warehouse" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨缁撴潫:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="datetime" class="layui-input" name="HRepairEndDate" id="HRepairEndDate" placeholder="璇烽�夋嫨鏃ユ湡">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">浠撲綅:</label>
- <div class="layui-input-block">
- <input type="text" name="HSPName" id="HSPName" class="layui-input" style="width:80%;">
- <input type="hidden" name="HSPID" id="HSPID" class="layui-input">
- <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="StockPlace" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <label class="layui-form-label" style="width: 75px;">缁翠慨鍐呭:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <textarea name="HRepairContent" id="HRepairContent" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
</div>
</div>
- </div>
- <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鍗曟嵁鍙�:</label>
<div class="layui-input-block" style="margin-left: 85px;">
@@ -155,6 +137,32 @@
</div>
<div class="layui-row">
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨浜�:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;padding: 9px 5px;">缁翠慨椤圭洰:</label>
+ <div class="layui-input-block">
+ <input type="text" name="HRepairName" id="HRepairName" class="layui-input" style="width:80%;">
+ <input type="hidden" name="HRepairID" id="HRepairID" class="layui-input">
+ <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Repair" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">缁翠慨瑕佹眰:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HExplanation" id="HExplanation" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 75px;padding: 9px 5px;">璐熻矗浜�:</label>
<div class="layui-input-block">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" style="width:80%;">
@@ -164,23 +172,17 @@
</button>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍚嶇О:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿瑙勬牸:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HBarSpec" id="HBarSpec" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
</div>
<div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍣ㄥ叿鍨嬪彿:</label>
+ <label class="layui-form-label" style="width: 75px;">璁惧鍚嶇О:</label>
+ <div class="layui-input-block" style="margin-left: 85px;">
+ <input type="text" name="HBarName" id="HBarName" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HEquipID" id="HEquipID" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 75px;">璁惧鍨嬪彿:</label>
<div class="layui-input-block" style="margin-left: 85px;">
<input type="text" name="HBarModel" id="HBarModel" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
@@ -188,13 +190,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 75px;">鏁伴噺:</label>
<div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HQty" id="HQty" class="layui-input" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 75px;">鍓╀綑瀵垮懡:</label>
- <div class="layui-input-block" style="margin-left: 85px;">
- <input type="text" name="HLeaveLife" id="HLeaveLife" class="layui-input" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HQty" id="HQty" value="1" class="layui-input" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -260,8 +256,8 @@
</div>
</div>
</div>
-
-
+
+
<div class="layer-footer" style="text-align: center;">
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Saver" id="Saver">鎻愪氦</button>
<button type="button" lay-submit="" class="layui-btn buttom_box_little" lay-filter="Add">鏂板</button>
@@ -287,10 +283,18 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , laydate = layui.laydate
+ ,laydate = layui.laydate
, element = layui.element;
//鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HRepairBeginDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HRepairEndDate'
+ , type: 'datetime'
+ });
laydate.render({
elem: '#HDate'
, type: 'datetime'
@@ -316,15 +320,13 @@
$("#HBarCode").focus();
//鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规寮�濮嬫椂闂�
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鐐规缁撴潫鏃堕棿
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerName").val(sessionStorage["HUserName"]); //鍒涘缓浜�
- $("#HManagerID").val(sessionStorage["HBillerID"]); //鍒涘缓浜�
+ $("#HManagerName").val(sessionStorage["HUserName"]); //鎿嶄綔鍛�
+ $("#HManagerID").val(sessionStorage["Czybm"]); //鎿嶄綔鍛業D
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
- $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
//妯℃不鍏锋潯鐮佹槸鍚︽壂鎻忔爣璁�
var HProcExchBillNoFlag = false;
@@ -332,14 +334,14 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3821' },
+ data: { "HBillType": '3910' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val("0");
$("#HBillNo").val(d.data[0].HBillNo);
}
});
-
+
//鏉″舰鐮佸洖杞︽柟娉�
$('#HBarCode').on('keydown', function (event) {
@@ -351,23 +353,20 @@
}
var index = layer.load();
$.ajax({
- url: GetWEBURL() + "/Mj_PDA_MoudlCheckBill/txtHBarCode_KeyDown",
+ url: GetWEBURL() + "/EquipMaintainBill/txtHBarCode",
type: "GET",
data: { "HBarCode": HBarCode },
success: function (result) {
if (result.count == 1) {
var data = result.data[0];
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HMouldID": data.hinterid,
+ "HEquipID": data.hinterid,
"HBarName": data.HName,
- "HBarSpec": data.HModel,
- "HBarModel": data.HModel2,
- "HQty": 1,
- "HLeaveLife": data.HLeaveLife
+ "HBarSpec": data.HModel
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
-
+
HProcExchBillNoFlag = true;
layer.close(index);
}
@@ -383,7 +382,7 @@
});
}
});
-
+
//閫�鍑�-鍏抽棴椤甸潰鏂规硶
$('#Cancel').on('click', function () {
@@ -393,29 +392,38 @@
})
//鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- //var tableData = data.field;
+ form.on('submit(Saver)', function (data) {
+ if (!$("#HBarCode").val()) {
+ layer.msg("璇锋壂鎻忚澶囨潯鐮�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HDeptID").val()) {
+ layer.msg("璇烽�夋嫨閮ㄩ棬!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HEmpID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HRepairID").val()) {
+ layer.msg("璇烽�夋嫨缁翠慨椤圭洰!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if (!$("#HManagerID").val()) {
+ layer.msg("璇烽�夋嫨璐熻矗浜�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
- var oMain = JSON.stringify(data.field);
- //var oMain = data.field;
+ var sMainSub = JSON.stringify(data.field);
var index = layer.load();
$.ajax({
type: "POST",
- url: GetWEBURL() + "/Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList_PDA",
- //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
+ url: GetWEBURL() + "/Sc_MouldRepairWorkBill/MouldRepairWorkBill_Save",
async: true,
- data: { "msg": oMain },
+ data: { "sMainSub": sMainSub },
dataType: "json",
success: function (data) {
if (data.count == 1) {
- //layer.confirm(data.Message, {
- // icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- // btn2: function () {
- // //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- // //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- // parent.location.href = "../../../views/index.html"
- // }//鍏抽棴
- //}, function () { window.location.reload(); });//鏂板
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
$('#Saver').removeClass("buttom_box_little");
@@ -432,34 +440,12 @@
}
});
});
+
//鏂板
- form.on('submit(Add)', function (data) {
- $('#Saver').addClass("buttom_box_little");
- $('#Saver').addClass("layui-btn-disabled").attr("disabled", false);
- $("#HBarCode").removeAttr("readonly");//鏉″舰鐮佹竻闄ゅ彧璇�
- $("#HBarCode").removeAttr("background-color");//鏉″舰鐮佹竻闄よ儗鏅壊
-
- // 娓呯┖琛ㄥ崟 锛堚�渇ormData鈥濇槸琛ㄥ崟鐨刬d锛�
- $("#formData")[0].reset();
- layui.form.render();
-
-
- $("#HBarCode").focus();
- //鑾峰彇鏈�澶у崟鎹彿
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3831' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val("0");
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒涘缓鏃ユ湡
- $("#HMaker").val(sessionStorage["HUserName"]); //鍒涘缓浜�
+ form.on('submit(Add)', function () {
+ window.location.reload();
})
+
//閮ㄩ棬寮圭獥
form.on('submit(Department)', function () {
//椤甸潰灞�-鑷畾涔�
@@ -494,22 +480,40 @@
});
});
- //鎶ュ簾鍘熷洜
- form.on('submit(ScrapReason)', function () {
+ //缁翠慨浜哄脊绐�
+ form.on('submit(HEmp)', function () {
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鎶ュ簾鍘熷洜鍒楄〃',
+ title: '缁翠慨浜哄垪琛�',
closeBtn: 1,
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html', 'yes'],
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker2', 'yes'],
cancel: function (index, layero) {
}
});
});
+
+ //缁翠慨椤圭洰寮圭獥
+ form.on('submit(Repair)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁翠慨椤圭洰鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_RepairList.html?Type=Repair', 'yes'],
+ cancel: function (index, layero) {
+ }
+ });
+ });
+
//浠撳簱
form.on('submit(Warehouse)', function () {
@@ -531,7 +535,7 @@
//閫夋嫨浠撲綅
form.on('submit(StockPlace)', function () {//閫夋嫨浠撲綅
var HWHID = $("#HWHID").val();
- if (HWHID== "") {
+ if (HWHID == "") {
layer.msg("璇峰厛閫夋嫨浠撳簱", { index: 0 });
return;
}
@@ -542,17 +546,18 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID+ '&Type=HSpID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html?HWhID=' + HWHID + '&Type=HSpID', 'yes']
, resize: false
, cancel: function () {
}
})
});
+
//浠ヤ笂涓簂ayui妯″潡
});
//杩斿洖閮ㄩ棬
- function GetHDeptNameValue(obj) {
+ function GetHDeptNameValue(obj) {
$("#HDeptName").val(obj[0].HName);
$("#HDeptID").val(obj[0].HItemID);
}
@@ -561,10 +566,15 @@
$("#HManagerName").val(obj[0].HName);
$("#HManagerID").val(obj[0].HItemID);
}
- //鎶ュ簾鍘熷洜
- function GetScrapReason(obj) {
- $("#HScrapReasonName").val(obj[0].HName);
- $("#HScrapReasonID").val(obj[0].HItemID);
+ //杩斿洖璐熻矗浜�
+ function GetHWorkerValue2(obj) {
+ $("#HEmpName").val(obj[0].HName);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ //杩斿洖缁翠慨椤圭洰
+ function GetRepairValue(obj) {
+ $("#HRepairName").val(obj[0].HName);
+ $("#HRepairID").val(obj[0].HItemID);
}
//浠撳簱
function GetHWHValue(obj) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
index 587e59c..05a832b 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserSuplies.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鐢ㄦ埛鍏宠仈渚涘簲鍟�</title>
+ <title>鏂板/缂栬緫鍣ㄥ叿閲囪喘鍏ュ簱鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
--
Gitblit v1.9.1