From ca9c6a8d0dc39a9d5a6b7013e29a2c63be54af78 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 10 九月 2021 09:46:52 +0800
Subject: [PATCH] 上料防错单列表，编辑、审核、反审核、删除
---
WebTM/views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html | 799 ++++++++++++++++++++++++++-----------------------
WebTM/views/生产管理/生产上料单/Sc_MaterToSourceBillList.html | 28 -
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 97 +++--
WebTM/views/IpadIndex.html | 7
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/layuiadmin/layui/css/ReportPlatform.css | 2
6 files changed, 487 insertions(+), 450 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 1edcd32..2ed5c55 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-08T06:44:54.9146584Z;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-09T08:03:10.7767751Z;True|2021-09-09T16:02:34.4764420+08:00;True|2021-09-09T15:58:51.0111602+08:00;True|2021-09-09T15:57:33.4337579+08:00;True|2021-09-09T15:56:28.7537483+08:00;True|2021-09-09T15:54:11.0247097+08:00;True|2021-09-09T09:14:45.3406247+08:00;True|2021-09-09T09:13:25.5062844+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>09/08/2021 18:23:56</publishTime>
+ <publishTime>09/09/2021 16:03:03</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>09/08/2021 18:23:56</publishTime>
+ <publishTime>09/09/2021 16:03:03</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -216,7 +216,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/layui/css/ReportPlatform.css">
- <publishTime>08/20/2021 17:12:22</publishTime>
+ <publishTime>09/09/2021 15:50:26</publishTime>
</File>
<File Include="layuiadmin/layui/css/zgqlayui.css">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -639,7 +639,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>09/08/2021 08:40:14</publishTime>
+ <publishTime>09/09/2021 09:14:26</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1086,13 +1086,13 @@
<publishTime>07/07/2021 16:04:21</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/index_Mobile.html">
<publishTime>07/17/2021 23:58:57</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>09/08/2021 09:14:54</publishTime>
+ <publishTime>09/09/2021 16:02:54</publishTime>
</File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 14:42:06</publishTime>
@@ -1356,7 +1356,7 @@
<publishTime>07/23/2021 13:20:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html">
- <publishTime>07/24/2021 00:34:41</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1375,6 +1375,9 @@
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
<publishTime>06/10/2021 11:10:39</publishTime>
+ </File>
+ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Xt_ORGANIZATIONSList.html">
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/b.grf">
<publishTime>07/24/2021 00:34:41</publishTime>
@@ -1425,7 +1428,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
<publishTime>08/20/2021 19:30:05</publishTime>
@@ -1449,7 +1452,7 @@
<publishTime>08/20/2021 15:10:21</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -1512,7 +1515,7 @@
<publishTime>07/24/2021 00:34:41</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1533,7 +1536,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1548,7 +1551,7 @@
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html">
<publishTime>08/20/2021 19:30:05</publishTime>
@@ -1947,7 +1950,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓婃枡闃查敊鍗�/Sc_Add_MaterToSourceBillList.html">
- <publishTime>09/08/2021 18:23:45</publishTime>
+ <publishTime>09/09/2021 11:05:51</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html">
<publishTime>09/07/2021 15:58:33</publishTime>
@@ -1965,10 +1968,10 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList.html">
- <publishTime>09/08/2021 17:57:17</publishTime>
+ <publishTime>09/09/2021 10:47:02</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>07/16/2021 09:13:04</publishTime>
@@ -2034,10 +2037,10 @@
<publishTime>06/28/2021 17:33:57</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
- <publishTime>09/03/2021 17:20:11</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">
- <publishTime>09/02/2021 16:14:12</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">
<publishTime>07/02/2021 16:55:33</publishTime>
@@ -2082,7 +2085,7 @@
<publishTime>09/08/2021 08:34:08</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2130,10 +2133,10 @@
<publishTime>06/29/2021 11:09:29</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>09/08/2021 08:55:53</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
- <publishTime>09/08/2021 08:53:56</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sc_Add_MouldDotCheckBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2142,7 +2145,7 @@
<publishTime>07/02/2021 16:55:33</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
- <publishTime>07/02/2021 16:55:33</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
<publishTime>07/02/2021 16:55:33</publishTime>
@@ -2154,19 +2157,19 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
<publishTime>08/20/2021 15:19:30</publishTime>
@@ -2178,7 +2181,7 @@
<publishTime>07/20/2021 01:15:26</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2220,10 +2223,10 @@
<publishTime>08/13/2021 17:36:43</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillEdit.html">
- <publishTime>09/08/2021 08:55:53</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainPlanBillList.html">
- <publishTime>09/08/2021 08:53:56</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sc_Add_MouldDotCheckBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2232,7 +2235,7 @@
<publishTime>07/02/2021 16:55:33</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
- <publishTime>07/02/2021 16:55:33</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2241,19 +2244,19 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
- <publishTime>06/10/2021 11:10:39</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
<publishTime>08/20/2021 15:19:30</publishTime>
@@ -2262,7 +2265,7 @@
<publishTime>08/20/2021 14:12:37</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2271,7 +2274,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
- <publishTime>07/20/2021 01:15:26</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
<publishTime>09/08/2021 08:34:08</publishTime>
@@ -2289,13 +2292,13 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">
- <publishTime>09/06/2021 18:56:21</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆/MES_StationInBill.html">
<publishTime>07/07/2021 15:14:17</publishTime>
@@ -2316,28 +2319,28 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
- <publishTime>08/18/2021 08:26:14</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_loser.html">
<publishTime>05/17/2021 19:07:00</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/08/2021 08:34:08</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">
- <publishTime>09/06/2021 18:56:21</publishTime>
+ <publishTime>09/08/2021 18:40:39</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2541,7 +2544,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/08/2021 18:24:04</publishTime>
+ <publishTime>09/09/2021 16:03:08</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a808e1a..519e921 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,12 +5,12 @@
//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://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
- var WEBURL = "http://localhost/API/";
+ //var WEBURL = "http://localhost/API/";
return WEBURL
}
diff --git a/WebTM/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index a2d16e9..851b901 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -52,7 +52,7 @@
.cns {
border: 1px solid #5FB878;
- height: 140px;
+ height: 160px;
border-radius: 5px;
}
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 21547a0..662ca53 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -82,9 +82,9 @@
html1 += '<dd>';
html1 += '<h1 style="display:none;"><span>璧勬簮ID锛�</span><span id="eqpid' + i + '">' + LoadData[i - 1].HSourceID + '</span></h1>';
html1 += '<h1><span>璁惧缂栧彿锛�</span><span id="eqp' + i + '">' + LoadData[i - 1].HSourceName + '</span></h1>';
- html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
- html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
- html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
+ //html1 += '<h1><span>褰撳墠宸ュ崟锛�</span><span id="po' + i + '">' + (LoadData[i - 1].HSourceBillNo == null ? '' : LoadData[i - 1].HSourceBillNo) + '</span></h1>';
+ //html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + i + '">' + (LoadData[i - 1].HName == null ? '' : LoadData[i - 1].HName) + '</span></h1>';
+ //html1 += '<h1><span>浜у搧瑙勬牸锛�</span><span id="pts' + i + '">' + (LoadData[i - 1].HModel == null ? '' : LoadData[i - 1].HModel) + '</span></h1>';
html1 += '<h1><span>璐熻矗浜猴細</span><span id="us' + i + '">' + LoadData[i - 1].HEmpName + '</span></h1>';
html1 += '</dd>';
html1 += '</dl>';
@@ -175,6 +175,7 @@
html1 += '<h1><span>宸ュ崟鍙凤細</span><span id="wk' + (i + 1) + '">' + LoadData1[i].HICMOBillNo + '</span></h1>';
html1 += '<h1><span>浜у搧鍚嶇О锛�</span><span id="ptn' + (i + 1) + '">' + LoadData1[i].HMaterName + '</span></h1>';
html1 += '<h1><span>浜у搧鍨嬪彿锛�</span><span id="pts' + (i + 1) + '">' + LoadData1[i].HModel + '</span></h1>';
+ html1 += '<h1><span>璁″垝鏁伴噺锛�</span><span>' + LoadData1[i].HDatePlanQty + '</span><span style="margin-left:20px;">姹囨姤鎬绘暟锛�</span><span>' + LoadData1[i].HDateFinishQty+'</span></h1>';
switch (LoadData1[i].HICMOStatus) {
case "寰呯敓浜�":
html1 += '<h1><span>褰撳墠鐘舵�侊細</span><span class="gj_icon color_border3"></span><span>' + LoadData1[i].HICMOStatus + '</span></h1>';
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
index efcd069..f26ae2f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\212\346\226\231\351\230\262\351\224\231\345\215\225/Sc_Add_MaterToSourceBillList.html"
@@ -383,7 +383,8 @@
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
- //#region 鍏敤鍙橀噺
+
+ //#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -396,7 +397,7 @@
var option2;
//#endregion
-
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
@@ -418,302 +419,9 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- //鍒濆鍖栨彃浠�
- function set_InitFrom() {
- //鏃ユ湡鏃堕棿閫夋嫨鍣�
- laydate.render({
- elem: '#HDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HMakeDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HUpDateDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCheckDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HCloseDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HDeleteDate'
- , type: 'datetime'
- });
- }
+ //#endregion
- //鍒濆鍖栬〃鏍�
- function set_InitGrid() {
- Table1(); //淇濆吇椤瑰垪琛�
- Table2(); //閰嶄欢椤瑰垪琛�
-
- }
-
- //鍒濆鍖栭厤鏂欏垪琛�
- function Table1() {
- //琛ㄥご
- columns = [
- { type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HBarCode', title: '鎵弿鏉＄爜', edit: 'text', hide: true }
- , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
- , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', edit: 'text' }
- , { field: 'HName', title: '鐗╂枡鍚嶇О', edit: 'text' }
- , { field: 'HModel', title: '瑙勬牸鍨嬪彿', edit: 'text' }
- , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
- , { field: 'HUnitName', title: '鍗曚綅', edit: 'text' }
- , { field: 'HMQty', title: '閰嶆枡鏁伴噺', edit: 'text' }
- , { field: 'HQty', title: '瀹為厤鏁伴噺', edit: 'text' }
- ];
- option = {
- id: 'mainTable'
- , elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
- , page: false
- , cellMinWidth: 120
- , height: 350
- , cols: [columns]
- , done: function (res, curr, count) {
-
- }
- };
- }
-
- //鍒濆鍖栭厤浠堕」鍒楄〃
- function Table2() {
- //琛ㄥご
- columns1 = [
- { type: 'checkbox', fixed: 'left' }
- , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HMouldID', title: '娌诲叿ID', edit: 'text', hide: true}
- , { field: 'HMouldNumber', title: '娌诲叿浠ｇ爜', edit: 'text' }
- , { field: 'HMouldName', title: '娌诲叿鍚嶇О', edit: 'text' }
- , { field: 'HMouldSpec', title: '瑙勬牸鍨嬪彿', edit: 'text' }
- ];
- option2 = {
- id: 'mainTable1'
- , elem: '#mainTable1'
- , toolbar: '#toolbarDemo1'
- , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
- , page: false
- , cellMinWidth: 120
- , height: 350
- , cols: [columns1]
- , done: function (res, curr, count) {
-
- }
- };
- }
-
- //鏃犳簮鍗曟柊澧�
- function set_AddFNew()
- {
- //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-
- }
-
- //鏈夋簮鍗曟柊澧�
- function set_AddNew() {
- get_MAXNum();
- set_SourceAdd();
- option.data = [];
- option2.data = [];
- table.render(option);
- table.render(option2);
- }
-
- //缂栬緫
- function set_EditFromGrid()
- {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- refSav = "Update";
- $('#HMaterCode').attr("disabled", true);
- $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMaterName').attr("disabled", true);
- $('#HMaterSpec').attr("disabled", true);
- $('#HBeginDate').attr("disabled", true);
- $('#HSourceName').attr("disabled", true);
- $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HMainSourceBillNo').attr("disabled", true);
- $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-
-
- $('#SourceType').attr("disabled", true);
- form.render('select');
- $('#HICMOBillNo').attr("disabled", true);
-
- set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
- set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
-
- }
-
- //缂栬緫鑾峰彇琛ㄥご
- function set_EditForm(linterid) {
- //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
- $.ajax({
- url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
- type: "GET",
- data: {
- "HID": linterid
- },
- success: function (result) {
- if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data.h_v_Sc_MouldMaintain[0];
- form.val("component-form-group", {
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HBeginDate": formatDate(data.淇濆吇寮�濮嬫棩鏈�)
- , "HEndDate": formatDate(data.淇濆吇缁撴潫鏃ユ湡)
- , "HExplanation": data.鎽樿
- , "HRemark": data.澶囨敞
- , "HPlanNo": data.淇濆吇璁″垝缂栧彿
- , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
- , "HMouldID": data.HMouldID
- , "HMouldName": data.浜у搧妯″叿
-
- });
-
- } else {
- layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
- }
- }, error: function () {
- layer.alert("鍙戠敓閿欒!", { icon: 5 });
- }
- });
- }
-
- // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
- function formatDate(date) {
- var d = new Date(date),
- month = '' + (d.getMonth() + 1),
- day = '' + d.getDate(),
- year = d.getFullYear();
-
- if (month.length < 2) month = '0' + month;
- if (day.length < 2) day = '0' + day;
-
- return [year, month, day].join('-');
- }
-
- // 缂栬緫鑾峰彇琛ㄤ綋
- function set_EditGrid(linterid) {
- $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鍔犺浇鏁版嵁
- $.ajax({
- url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
- type: "GET",
- data: { "HInterID": linterid },
- success: function (result) {
- if (result.count == 1) {
- option.data = result.list[0];
- table.render(option);
- option2.data = result.list[1];
- table.render(option2);
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- }
-
- //鏈夋簮鍗曟柊澧�
- function set_SourceAdd() {
- refSav = "Add";
- //鍒濆鍩烘湰淇℃伅璧嬪��
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HWorkReportDate").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"]); //鍒跺崟浜�
-
- //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
- $('#HICMOBillNo').attr("disabled", true);
- $('#HSourceBillNo').attr("disabled", true);
- $('#HProcExchBillNo').attr("disabled", true);
- $('#HProcName').attr("disabled", true);
- $('#HMaterCode').attr("disabled", true);
- $('#HMaterList').addClass("layui-btn-disabled").attr("disabled",true);
- $('#HMaterName').attr("disabled", true);
- $('#HMaterSpec').attr("disabled", true);
- $('#HPlanQty').attr("disabled", true);
- $('#HSourceName').attr("disabled", true);
- $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HWorkBeginDate').attr("disabled", true);
- $('#HWorkReportDate').attr("disabled", true);
-
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: {
- "HSourceInterID": HSourceInterID,
- "HSourceEntryID": HSourceEntryID,
- "HSourceBillNo": HSourceBillNo,
- "HSourceBillType": HBillType
- },
- dataType: "json",
- success: function (data) {
- if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
- {
- var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
- $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
- $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
- $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
- $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
- $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
- $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
- $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
- $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
- $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
- $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
- $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
- $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
- $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟鍙�
- $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
- $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁㈠崟鏁伴噺
-
- }
- else {
- layer.alert(data.Message, { icon: 5 });
-
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 });
- }
- });
- }
-
- //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
- function get_MAXNum() {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3786' },
- success: function (d) {
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInterID").val(0);
- }
- });
- }
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//鏂板淇濆瓨
form.on('submit(Add)', function (data) {
@@ -732,7 +440,7 @@
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
- var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
@@ -749,17 +457,18 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
$("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.confirm(data.Message, {icon: 1,
+ layer.confirm(data.Message, {
+ icon: 1,
btn: ['纭']
}, function (index) {
- if (data.Verify == "Y") //鑷姩瀹℃牳
- {
- layer.close(index);
- SaveVerify(); //瀹℃牳
- }
- else {
- layer.close(index);
- }
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ layer.close(index);
+ SaveVerify(); //瀹℃牳
+ }
+ else {
+ layer.close(index);
+ }
});
}
else {
@@ -782,72 +491,6 @@
ReVerIfySaver();
});
- //瀹℃牳鎻愪氦
- function SaveVerify()
- {
- var InterID = $("#HInterID").val();
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- //layer.close(layer.index);
- //window.parent.location.reload();
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
- }
-
- //鍙嶅鏍告彁浜�
- function ReVerIfySaver() {
- var InterID = $("#HInterID").val();
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
- {
- return false;
- }
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- //layer.close(layer.index);
- //window.parent.location.reload();
- });
- }
- else {
- layer.alert(data.Message, { icon: 5 })
- }
- },
- error: function (err) {
- layer.alert(err, { icon: 5 })
- }
- })
- }
-
-
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
@@ -868,7 +511,7 @@
$.ajax({
url: GetWEBURL() + "/Sc_MaterToSourceBill/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "HBarCode": HBarCode, "HSourceID": "111", "HICMOInterID": "100030", "HICMOEntryID": "100050"},
+ data: { "HBarCode": HBarCode, "HSourceID": "111", "HICMOInterID": "100030", "HICMOEntryID": "100050" },
success: function (result) {
console.info(result);
if (result.count == 1) {
@@ -876,8 +519,7 @@
$("#HSourceID").val(result.data.Gy_Source[0].HItemID);
$("#HSourceName").val(result.data.Gy_Source[0].HName);
}
- if (result.Verify == '鐢ㄦ枡娓呭崟鐗╂枡鏉＄爜')
- {
+ if (result.Verify == '鐢ㄦ枡娓呭崟鐗╂枡鏉＄爜') {
//鍥炲啓鐢ㄦ枡娓呭崟鏁版嵁鍒楄〃
// 婧愭暟鎹�
tableBak = table.cache.mainTable;
@@ -889,8 +531,7 @@
option.data = table.cache["mainTable"];
table.render(option);
}
- else
- {
+ else {
// 鍘婚噸(涓嶈兘鏈夌浉鍚屾壂鐮佺墿鏂�)
for (var i = 0; i < tableBak.length; i++) {
console.log(tableBak[i].HMaterID, result.data[0].HMaterID);
@@ -1116,7 +757,7 @@
var AddRow = table.cache['mainTable'];
switch (obj.event) {
//鍒犻櫎涓�琛�
- case 'btn-DeleteLine': btnDeleteLine(checkStatus,data, obj);
+ case 'btn-DeleteLine': btnDeleteLine(checkStatus, data, obj);
break;
}
});
@@ -1133,6 +774,405 @@
break;
}
});
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+ //鍒濆鍖栨彃浠�
+ function set_InitFrom() {
+ //鏃ユ湡鏃堕棿閫夋嫨鍣�
+ laydate.render({
+ elem: '#HDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HMakeDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HUpDateDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCheckDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HCloseDate'
+ , type: 'datetime'
+ });
+ laydate.render({
+ elem: '#HDeleteDate'
+ , type: 'datetime'
+ });
+ }
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ Table1(); //淇濆吇椤瑰垪琛�
+ Table2(); //閰嶄欢椤瑰垪琛�
+
+ }
+
+ //鍒濆鍖栭厤鏂欏垪琛�
+ function Table1() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HBarCode', title: '鎵弿鏉＄爜', edit: 'text', hide: true }
+ , { field: 'HMaterID', title: '鐗╂枡ID', edit: 'text', hide: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜', edit: 'text' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О', edit: 'text' }
+ , { field: 'HModel', title: '瑙勬牸鍨嬪彿', edit: 'text' }
+ , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+ , { field: 'HUnitName', title: '鍗曚綅', edit: 'text' }
+ , { field: 'HMQty', title: '閰嶆枡鏁伴噺', edit: 'text' }
+ , { field: 'HQty', title: '瀹為厤鏁伴噺', edit: 'text' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
+ , page: false
+ , cellMinWidth: 120
+ , height: 350
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
+ //鍒濆鍖栭厤浠堕」鍒楄〃
+ function Table2() {
+ //琛ㄥご
+ columns1 = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HMouldID', title: '娌诲叿ID', edit: 'text', hide: true}
+ , { field: 'HMouldNumber', title: '娌诲叿浠ｇ爜', edit: 'text' }
+ , { field: 'HMouldName', title: '娌诲叿鍚嶇О', edit: 'text' }
+ , { field: 'HMouldSpec', title: '瑙勬牸鍨嬪彿', edit: 'text' }
+ ];
+ option2 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , toolbar: '#toolbarDemo1'
+ , defaultToolbar: false //鏄惁鏄剧ず鍙充晶宸ュ叿鏍�
+ , page: false
+ , cellMinWidth: 120
+ , height: 350
+ , cols: [columns1]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew()
+ {
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#form0")[0].reset();
+ layui.form.render();
+ get_MAXNum();
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HWorkReportDate").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"]); //鍒跺崟浜�
+ }
+
+ //鏈夋簮鍗曟柊澧�
+ function set_AddNew() {
+ get_MAXNum();
+ set_SourceAdd();
+ option.data = [];
+ option2.data = [];
+ table.render(option);
+ table.render(option2);
+ }
+
+ //缂栬緫
+ function set_EditFromGrid()
+ {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ refSav = "Update";
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HBeginDate').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HMainSourceBillNo').attr("disabled", true);
+ $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+
+
+ $('#SourceType').attr("disabled", true);
+ form.render('select');
+ $('#HICMOBillNo').attr("disabled", true);
+
+ set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
+ set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
+
+ }
+
+ //缂栬緫鑾峰彇琛ㄥご
+ function set_EditForm(linterid) {
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Sc_MaterToSourceBill/Sc_MaterToSourceBillListCheckDetai",
+ type: "GET",
+ data: {
+ "HID": linterid
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Sc_MaterToSourceBillMain[0];
+ form.val("component-form-group", {
+ "HInterID": data.hmainid
+ , "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ , "HPlanQty":"0"
+ , "HICMOBillNo": data.浠诲姟鍗曞彿
+ , "HICMOInterID": data.HICMOInterID
+ , "HICMOEntryID": data.HICMOEntryID
+ , "HProcExchBillNo": data.宸ュ簭娴佽浆鍗″彿
+ , "HProcExchQty": ""
+ , "HSourceInterID": data.HMainSourceInterID
+ , "HSourceEntryID": data.HMainSourceEntryID
+ , "HSourceBillNo": data.HMainSourceBillNo
+ , "HSourceBillType": data.HMainSourceBillType
+ , "HProcName":""
+ , "HProcID": "0"
+ , "HMaterCode": data.浜у搧浠ｇ爜
+ , "HMaterID": data.HMaterID
+ , "HMaterName": data.浜у搧鍚嶇О
+ , "HMaterSpec": data.瑙勬牸鍨嬪彿
+ , "HSourceID": data.HSourceID
+ , "HSourceName": data.鐢熶骇璧勬簮
+ , "HGroupName": data.鐢熶骇鐝粍
+ , "HGroupID": data.HGroupID
+ , "HWorkerName": data.鎿嶄綔宸�
+ , "HWorkerID": data.HWorkerID
+ , "HMaker": data.鍒跺崟浜� //鍒跺崟浜�
+ , "HMakeDate": formatDate(data.鍒跺崟鏃ユ湡) //鍒跺崟鏃ユ湡
+ , "HUpDater": sessionStorage["HUserName"] //淇敼浜�
+ , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss") //淇敼鏃ユ湡
+ , "HChecker": data.瀹℃牳浜� //瀹℃牳浜�
+ , "HCheckDate": formatDate(data.瀹℃牳鏃ユ湡) //瀹℃牳鏃ユ湡
+ , "HCloseMan": data.鍏抽棴浜� //鍏抽棴浜�
+ , "HCloseDate": formatDate(data.鍏抽棴鏃ユ湡) //鍏抽棴鏃ユ湡
+ , "HDeleteMan": data.浣滃簾浜� //浣滃簾浜�
+ , "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡) //浣滃簾鏃ユ湡
+
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+
+ // 缂栬緫鑾峰彇琛ㄤ綋
+ function set_EditGrid(linterid) {
+ $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Sc_MaterToSourceBill/Sc_MaterToSourceBillListProjectDetai',
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.list[0];
+ table.render(option);
+ option2.data = result.list[1];
+ table.render(option2);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鏈夋簮鍗曟柊澧�
+ function set_SourceAdd() {
+ refSav = "Add";
+ //鍒濆鍩烘湰淇℃伅璧嬪��
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
+ $("#HWorkReportDate").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"]); //鍒跺崟浜�
+
+ //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+ $('#HICMOBillNo').attr("disabled", true);
+ $('#HSourceBillNo').attr("disabled", true);
+ $('#HProcExchBillNo').attr("disabled", true);
+ $('#HProcName').attr("disabled", true);
+ $('#HMaterCode').attr("disabled", true);
+ $('#HMaterList').addClass("layui-btn-disabled").attr("disabled",true);
+ $('#HMaterName').attr("disabled", true);
+ $('#HMaterSpec').attr("disabled", true);
+ $('#HPlanQty').attr("disabled", true);
+ $('#HSourceName').attr("disabled", true);
+ $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
+
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: {
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
+ "HSourceBillType": HBillType
+ },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
+ $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
+ $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
+ $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
+ $("#HMaterCode").val(LoadData[0].HMaterNumber); //浜у搧浠ｇ爜
+ $("#HMaterName").val(LoadData[0].HMaterName); //浜у搧鍚嶇О
+ $("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
+ $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+ $("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
+ $("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+ $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+ $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+ $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
+ $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
+ $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+ $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+ $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟鍙�
+ $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁㈠崟鏁伴噺
+
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+ function get_MAXNum() {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3786' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
+ }
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify()
+ {
+ var InterID = $("#HInterID").val();
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+ if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
+ //鍙嶅鏍告彁浜�
+ function ReVerIfySaver() {
+ var InterID = $("#HInterID").val();
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+ if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
//鍒犻櫎琛�
function btnDeleteLine(checkStatus,data) {
@@ -1182,6 +1222,7 @@
});
}
+ //#endregion
//浠ヤ笂涓簂ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
index 2e1c027..cb215d1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\270\212\346\226\231\345\215\225/Sc_MaterToSourceBillList.html"
@@ -152,7 +152,7 @@
case 'btn-Audit': set_CheckBill();
break;
//鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_DeCheckBill();
+ case 'btn-DeAudit': set_AbandonCheck();
break;
//閫�鍑�
case 'get_Exit': Pub_Close(2);
@@ -199,12 +199,14 @@
, page: true
, cellMinWidth: 120
, cols: [[
- { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ { type: 'checkbox', fixed: 'left' }
+ , { 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: 'HBillType', title: 'HBillType', hide: true }
- , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: 'HBillType', title: 'HBillType', hide: true }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', hide: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
, { field: 'HSourceID', title: 'HSourceID', hide: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
, { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
@@ -221,19 +223,9 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅鍚嶇О' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '浠堕噺', title: '浠堕噺' }
- , { field: '鎵弿鏃堕棿', title: '鎵弿鏃堕棿', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
- , { field: '绠卞彿鏉＄爜', title: '绠卞彿鏉＄爜' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
@@ -407,7 +399,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
@@ -442,7 +434,7 @@
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
--
Gitblit v1.9.1