From fb559778d06310c69876140d33336475c9b3bc4d Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期六, 18 九月 2021 08:26:26 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 1
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillList.html | 295 +++++-----
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 8
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairInBillEdit.html | 1117 +++++++++++++++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html | 2
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 8
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 111 ++-
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 8
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/WebTM.csproj | 1
11 files changed, 1,351 insertions(+), 210 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 359ccf3..099f061 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-09-14T06:20:12.9552865Z;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-09-17T07:06:30.4485214Z;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>08/27/2021 09:06:17</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>09/14/2021 13:49:48</publishTime>
+ <publishTime>09/17/2021 11:22:10</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>09/14/2021 13:49:48</publishTime>
+ <publishTime>09/17/2021 11:22:10</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -639,7 +639,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>09/14/2021 14:19:18</publishTime>
+ <publishTime>09/17/2021 15:06:23</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1086,7 +1086,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/index_Mobile.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1655,8 +1655,11 @@
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldMoveStockStepOutBill.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
<publishTime>09/14/2021 08:23:22</publishTime>
@@ -1670,23 +1673,50 @@
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBill.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepInBillList.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBill.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldMoveStockStepOutBillList.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 11:18:56</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillEdit.html">
+ <publishTime>09/16/2021 13:17:38</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdInBillList.html">
+ <publishTime>09/16/2021 18:21:09</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdMoveBillList.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 11:18:56</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairInBillList.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
+ </File>
+ <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldRepairOutBillList.html">
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1695,7 +1725,7 @@
<publishTime>09/14/2021 08:23:22</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
<publishTime>09/09/2021 10:34:50</publishTime>
@@ -1746,7 +1776,7 @@
<publishTime>09/08/2021 13:40:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/17/2021 11:21:43</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
<publishTime>09/08/2021 13:40:24</publishTime>
@@ -1773,7 +1803,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
<publishTime>09/14/2021 08:23:22</publishTime>
@@ -1788,22 +1818,22 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 11:18:56</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 11:18:56</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1836,7 +1866,7 @@
<publishTime>09/08/2021 13:40:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/17/2021 11:21:43</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
<publishTime>09/08/2021 13:40:24</publishTime>
@@ -1875,13 +1905,13 @@
<publishTime>09/08/2021 13:40:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/17/2021 11:21:43</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 13:17:38</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/16/2021 16:04:24</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBill.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2139,7 +2169,7 @@
<publishTime>09/14/2021 08:23:22</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 08:09:24</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>09/14/2021 08:23:22</publishTime>
@@ -2196,10 +2226,10 @@
<publishTime>07/20/2021 01:15:26</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/08/2021 16:03:24</publishTime>
+ <publishTime>09/16/2021 16:52:24</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>09/08/2021 13:40:24</publishTime>
+ <publishTime>09/16/2021 16:54:48</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
<publishTime>09/08/2021 13:40:24</publishTime>
@@ -2232,7 +2262,7 @@
<publishTime>09/14/2021 08:23:22</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
- <publishTime>09/14/2021 08:23:22</publishTime>
+ <publishTime>09/15/2021 08:09:24</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillList.html">
<publishTime>09/14/2021 08:23:22</publishTime>
@@ -2280,16 +2310,16 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/08/2021 16:03:24</publishTime>
+ <publishTime>09/16/2021 16:52:24</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>09/08/2021 13:40:24</publishTime>
+ <publishTime>09/16/2021 16:54:48</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
- <publishTime>09/09/2021 15:34:37</publishTime>
+ <publishTime>09/16/2021 14:53:26</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
<publishTime>09/09/2021 15:48:48</publishTime>
@@ -2298,19 +2328,19 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/16/2021 15:27:36</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
- <publishTime>09/08/2021 13:40:24</publishTime>
+ <publishTime>09/16/2021 16:29:49</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html">
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
- <publishTime>09/09/2021 15:54:30</publishTime>
+ <publishTime>09/15/2021 09:55:45</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>09/08/2021 15:27:36</publishTime>
+ <publishTime>09/15/2021 09:59:56</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">
<publishTime>09/08/2021 15:31:08</publishTime>
@@ -2334,7 +2364,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <publishTime>09/08/2021 14:34:01</publishTime>
+ <publishTime>09/16/2021 13:59:28</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
<publishTime>09/08/2021 14:35:57</publishTime>
@@ -2343,17 +2373,20 @@
<publishTime>05/17/2021 19:07:00</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/09/2021 15:54:30</publishTime>
+ <publishTime>09/15/2021 09:50:41</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
<publishTime>09/08/2021 15:54:13</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/09/2021 15:54:30</publishTime>
+ <publishTime>09/15/2021 09:50:41</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
<publishTime>09/08/2021 15:54:13</publishTime>
</File>
+ <File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationQty.html">
+ <publishTime>09/09/2021 15:19:52</publishTime>
+ </File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">
<publishTime>09/08/2021 15:55:15</publishTime>
</File>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 2b9c5f9..d1a78b4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -568,6 +568,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldMoveStockStepOutBill.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdInBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldRepairInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index e6b0b20..e6f6192 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,7 +6,7 @@
//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://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
index 212c6a3..c250511 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillEdit.html"
@@ -50,7 +50,7 @@
<li class="layui-this">鍩烘湰淇℃伅</li>-->
<!--<li>鍏朵粬淇℃伅</li>-->
<!--</ul>-->
- <h1 style="text-align:center;"><b>妯″叿鎶ュ簾鍏ュ簱鍗�</b></h1>
+ <h1 style="text-align:center;"><b>妯″叿閲囪喘鍏ュ簱鍗�</b></h1>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
new file mode 100644
index 0000000..540ec41
--- /dev/null
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillEdit.html"
@@ -0,0 +1,1117 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鏂板/缂栬緫鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/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>
+ <style type="text/css">
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+ /*end*/
+
+ </style>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_DeleteBill" id="set_DeleteBill">鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="get_PrintReport" id="get_PrintReport">棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <div class=" layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input id="HInterID" name="HInterID" type="hidden" />
+ </div>
+ </div>
+ <div class=" layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴鍗曟嵁鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class=" layui-inline">
+ <label class="layui-form-label">浠撶鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class=" layui-inline">
+ <label class="layui-form-label">缁翠慨鍗曚綅</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class=" layui-inline">
+ <label class="layui-form-label">閫佷慨浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">璐熻矗浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁翠慨閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁翠慨绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鍛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">淇敼鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine" id="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine" id="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ <!--闅愯棌瀛楁-->
+ <input type="hidden" name="HInnerBillNo" id="HInnerBillNo" value="">
+ </form>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ }
+
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺路
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ var sWhere = "";
+ var sBillType = "3826";
+ TabRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HRemark": "" };
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鏂板
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = TabRow;
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //琛ㄥご淇℃伅浠撳簱寮圭獥
+ form.on('submit(WareHouse)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareHouseInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWHID").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(HSecManagerList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSecManagerName").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").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(HKeeperList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HKeeperName").val(checkStatus.data[0].HName);
+ $("#HKeeperID").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(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/DeptInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {
+ var refSav = "";
+ if (linterid == "" || linterid == null) {
+ refSav = "Add";
+ }
+ if (linterid != "" && linterid != null) {
+ refSav = "Update";
+ }
+ //debugger;
+ data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MouldProdInHouseBill/SaveGetMouldProdInHouseBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {//
+ Pub_Close(1);
+ });
+ //鎵撳嵃Printing
+ form.on("submit(print)", function (data) {
+ layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + hID);
+ //window.open("../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+ window.open("HBarPlanPrint.html?linterid=" + hID + "&Type=HDepartMent" + "&OpenTmp=b");
+
+ });
+ //鍏抽棴褰撳墠椤�
+ form.on('submit(Cancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+ //鐩戝惉鍗曞厓鏍肩紪杈� 鍗曞厓鏍肩紪杈戝悗 鍙樻洿
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ switch (field) {
+ case "HDesignLife": //璁捐瀵垮懡
+ value = isNaN(value) ? 0 : value;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDesignLife: value, //璁捐瀵垮懡
+ HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HLeaveLife": //鍓╀綑瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+ obj.update({
+ HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HUseLife": //浣跨敤瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ value = isNaN(value) ? 0 : value;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HQty": //瀹炴敹鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HPrice": //鍗曚环
+ value = isNaN(value) ? 0 : value;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HMoney": //閲戦
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ default:
+ }
+ });
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ , elem:'#HMakeDate'
+ });
+ }
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterCode', title: '妯″叿浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
+ , { field: 'HMaterName', title: '妯″叿鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
+ , { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
+ , { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HQty', title: '瀹炴敹鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
+ , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 100 }
+ , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ option.data = [TabRow];
+ table.render(option);
+ }
+ //鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": sBillType },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+ $("#HInterID").val(0);
+ }
+ });
+ }
+ //缂栬緫
+ function set_EditFromGrid(linterid) {
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+ option.data = [TabRow];
+ table.render(option);
+ }
+ //缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "Sc_CheckToolsRepairWorkBillList/Sc_MouldRepairInHouseBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MouldProdInHouseBillList[0];
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HWHID": data.hwhid //浠撳簱ID
+ , "HWHName": data.鏀舵枡浠撳簱 //浠撳簱鍚嶇О
+ , "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
+ , "HSecManagerName": data.楠屾敹鍛� //楠屾敹鍛樺悕绉�
+ , "HKeeperID": data.hkeeperid //淇濈鍛業D
+ , "HKeeperName": data.淇濈鍛� //淇濈鍛樺悕绉�
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": data.婧愬崟绫诲瀷 //婧愬崟绫诲瀷
+ , "XDH": "" //閫夊崟鍙�
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+ //缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MouldProdInBill/Sc_MouldScrapInProdBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //鏃ユ湡鏍煎紡鍖�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ //obj.del();
+ //layer.close(index);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ }
+ });
+ }
+ }
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ if (obj.event === 'HMaterCode') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ {
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨妯″叿
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '妯″叿鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/MouldInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterCode: checkStatus.data[0].HNumber,
+ HMaterName: checkStatus.data[0].HName,
+ HMaterSpec: checkStatus.data[0].HModel,
+
+ HDesignLife: 0, //璁捐瀵垮懡
+ HLeaveLife: 0, //鍓╀綑瀵垮懡
+ HQty: 1, //瀹炴敹鏁伴噺
+ HMoney: 0, //閲戦
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //杈呭姪灞炴�т俊鎭�
+ if (obj.event === 'HPropertyCode') //杈呭姪灞炴�т俊鎭�
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '杈呭姪灞炴�у垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/PropertyInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HPropertyID: checkStatus.data[0].HItemID,
+ HPropertyCode: checkStatus.data[0].HNumber,
+ HPropertyName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //杈呭姪璁￠噺鍗曚綅浠ｇ爜
+ if (obj.event === 'HSecUnitCode') //杈呭姪璁￠噺鍗曚綅浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '杈呭姪璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UnitInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSecUnitID: checkStatus.data[0].HItemID,
+ HSecUnitCode: checkStatus.data[0].HNumber,
+ HSecUnitName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //璁￠噺鍗曚綅浠ｇ爜
+ if (obj.event === 'HUnitCode') //璁￠噺鍗曚綅浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁￠噺鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UnitInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HUnitID: checkStatus.data[0].HItemID,
+ HUnitCode: checkStatus.data[0].HNumber,
+ HUnitName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //浠撳簱浠ｇ爜
+ if (obj.event === 'HWHCode') //浠撳簱浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HWHID: checkStatus.data[0].HItemID,
+ HWHCode: checkStatus.data[0].HNumber,
+ HWHName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //浠撲綅浠ｇ爜
+ if (obj.event === 'HSPCode') //浠撲綅浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撲綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareLocationInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSPID: checkStatus.data[0].HItemID,
+ HSPCode: checkStatus.data[0].HNumber,
+ HSPName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+ //?
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+ if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("楠屾敹鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("淇濈鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,妯″叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+ //#endregion
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html"
index c28d4ce..a3dbace 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_MouldRepairInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldRepairInBillList.html"
@@ -93,6 +93,7 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -105,37 +106,62 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
-
- //鍒濆鍖栫晫闈�
- set_ClearBill();
-
+ var columns = "";
+ var DataList;
+ var Name = "MouldRepairInBillList";
//#endregion
-
- //#region 閲嶇疆鎸夐挳
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //鏂板
+ case 'btn-Add': set_AddNew();
+ break;
+ //缂栬緫
+ case 'btn-Edit': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'btn-Delete': set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
//娓呯┖杩囨护鏉′欢
set_ClearQuery();
});
//#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
- //#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {
- get_FastQuery(table, option);
- });
- //#endregion
-
- //#region 鍒濆鍖栫晫闈�
+ //鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
- //鏌ヨ
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
get_Display(sWhere);
}
- //#endregion
- //#region 鍒濆鍖栬〃鏍兼柟娉�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -210,7 +236,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Sc_MouldRepairInBillList/GetMouldRepairInBillList',
+ url: GetWEBURL() + '/Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -228,126 +254,7 @@
}
});
}
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch (obj.event) {
- case 'btn-Add':
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板妯″叿棰嗙敤鍗�',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html',
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
- }
- });
- break;
- case 'btn-Edit':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var hID = data[0].hmainid.toString();
- //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '缂栬緫妯″叿棰嗙敤鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?hID=' + hID
- , resize: false,
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- }
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
-
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
-
- break;
- case 'btn-Delete':
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- break;
- //鍒锋柊
- case 'get_Refresh': get_Refresh();
- break;
- //閫�鍑烘寜閽�
- case 'get_Exit': Pub_Close(2);
- break;
- };
- });
-
- ////杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- //$.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/Sc_MouldProdOutBill/GetMouldProdOutBill',
- // type: "GET",
- // data: { "sWhere": sWhere},
- // success: function (data1) {
- // if (data1.count == 1) {
- // option.data = data1.data;
- // table.render(option);
- // layer.close(index);
- // } else {
- // layer.close(index);
- // layer.alert(data1.code + data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(index);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- //});
-
- //#region 蹇�熻繃婊�
+ //蹇�熻繃婊�
function get_FastQuery(table, option) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
@@ -364,38 +271,106 @@
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
- //#endregion
- //#region 閲嶇疆杩囨护鏉′欢
+ //閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HDate").val("");//寮�濮嬫棩鏈�
$("#HDate1").val("");//缁撴潫鏃ユ湡
$("#HBillNo").val("");//鍗曟嵁鍙�
sWhere = "";
+ get_Display(sWhere);
}
- //#endregion
+ //鏂板
+ function set_AddNew() {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板妯″叿棰嗙敤鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
- //#region 鍒锋柊
+ }
+ });
+ }
+ //淇敼
+ function set_ShowBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫妯″叿棰嗙敤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html?hID=' + hID
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_MouldProdOutBill/DeltetMouldProdOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ }
+ //鍒锋柊
function get_Refresh() {
set_ClearQuery();
get_Display(sWhere);
}
- //#endregion
-
-
-
- ////鐩戝惉琛屽弻鍑讳簨浠�
- //table.on('rowDouble(mainTable)', function (obj) {
- // layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
- //});
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 5712376..7f0d77d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -14,7 +14,6 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<style type="text/css">
-
/*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
.layui-form-item .layui-inline {
margin-top: 5px;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 2f88609..41222bb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -683,8 +683,12 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- //淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ if (result.Verify == "Y") {
+ location.replace('Cj_StationEntrustInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ } else {
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index 4818737..d699cf2 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -863,8 +863,12 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- //淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ if (result.Verify == "Y") {
+ location.replace('Cj_StationEntrustOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ } else {
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 07dec9d..25775cf 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -797,8 +797,12 @@
if (data.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- //淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ if (result.Verify == "Y") {
+ location.replace('Cj_StationOutBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ } else {
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
}
else {
layer.close(index);
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index e21029a..be018b5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -493,8 +493,12 @@
if (result.count == 1) {
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
- //淇濆瓨鍚庢祻瑙�
- ReRoadBillMain();
+ if (result.Verify == "Y") {
+ location.replace('Cj_StationInBill.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
+ } else {
+ //淇濆瓨鍚庢祻瑙�
+ ReRoadBillMain();
+ }
}
else {
layer.close(index);
--
Gitblit v1.9.1