From e71fc163d43fccf7f81369b4835df3d29a3ab0d3 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 06 九月 2021 18:56:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/上料防错单/Sc_Add_MaterToSourceBillList.html | 82 +++---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 26 +-
WebTM/views/车间管理/工序出站汇报单/Sc_StationOutBill_Mul.html | 3
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 58 ++--
WebTM/views/IpadIndex.html | 12
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 3
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 4
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 296 +++++++++++++++++-----
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 7
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 33 ++
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 2
WebTM/views/车间管理/工序进站接收单/Sc_StationInBill_Mul.html | 1
WebTM/views/index.html | 5
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 93 ++++++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 104 +++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 45 ++-
19 files changed, 571 insertions(+), 209 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 13dc4b4..70a5715 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-03T07:39:13.3956181Z;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-06T01:33:26.6804733Z;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">
@@ -639,7 +639,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>09/03/2021 15:36:07</publishTime>
+ <publishTime>09/06/2021 09:33:17</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1092,7 +1092,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>09/03/2021 15:18:56</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/PublicPage/AreaInformation.html">
<publishTime>08/27/2021 16:49:52</publishTime>
@@ -1425,7 +1425,7 @@
<publishTime>08/16/2021 17:24:30</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1497,7 +1497,7 @@
<publishTime>09/02/2021 16:08:15</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1542,13 +1542,13 @@
<publishTime>09/02/2021 16:08:15</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
<publishTime>09/01/2021 17:19:05</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1947,7 +1947,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓婃枡闃查敊鍗�/Sc_Add_MaterToSourceBillList.html">
- <publishTime>09/03/2021 15:18:56</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -1968,7 +1968,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
- <publishTime>09/02/2021 16:23:22</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2034,7 +2034,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html">
- <publishTime>09/03/2021 15:35:34</publishTime>
+ <publishTime>09/03/2021 16:41:11</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">
<publishTime>09/02/2021 16:08:15</publishTime>
@@ -2106,7 +2106,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>09/02/2021 16:22:05</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/02/2021 16:22:05</publishTime>
@@ -2115,10 +2115,10 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2157,7 +2157,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>09/03/2021 14:12:38</publishTime>
+ <publishTime>09/03/2021 16:41:21</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2178,10 +2178,10 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/03/2021 15:38:29</publishTime>
+ <publishTime>09/03/2021 16:41:28</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_Add_EqpConkBookBillList.html">
<publishTime>09/01/2021 10:26:34</publishTime>
@@ -2202,16 +2202,16 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>09/02/2021 16:22:05</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
<publishTime>09/02/2021 16:22:05</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillList.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipMaintainBillEdit.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2244,7 +2244,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
- <publishTime>09/03/2021 14:12:38</publishTime>
+ <publishTime>09/03/2021 16:41:21</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2262,10 +2262,10 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
- <publishTime>09/03/2021 15:38:29</publishTime>
+ <publishTime>09/03/2021 16:41:28</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
- <publishTime>09/02/2021 16:08:15</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">
<publishTime>08/27/2021 09:06:17</publishTime>
@@ -2289,10 +2289,10 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
- <publishTime>08/27/2021 09:06:17</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
- <publishTime>08/30/2021 08:44:23</publishTime>
+ <publishTime>09/06/2021 09:32:57</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Sc_StationOutBill_Mul.html">
<publishTime>09/03/2021 11:28:59</publishTime>
@@ -2325,16 +2325,16 @@
<publishTime>05/17/2021 19:07:00</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/02/2021 14:09:55</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/03/2021 09:13:07</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
- <publishTime>09/02/2021 14:09:55</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
- <publishTime>09/03/2021 09:13:07</publishTime>
+ <publishTime>09/06/2021 08:29:07</publishTime>
</File>
<File Include="views/杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Sc_StationInBill_Mul.html">
<publishTime>09/03/2021 11:28:08</publishTime>
@@ -2541,7 +2541,7 @@
<publishTime>08/27/2021 09:06:17</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/30/2021 09:52:57</publishTime>
+ <publishTime>09/06/2021 09:33:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 1b61739..96c079b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\Git浠撳簱\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\Git浠撳簱\椤圭洰\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index e5309bf..ab1cbc3 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -762,14 +762,10 @@
success: function (dom, index) {
var data = [];
data.push({
- "workcode": workcode,
- "HSourceID": HSourceID1,
- "HSourceName": HSourceName1,
- "HICMOInterID": HICMOInterID,
- "HICMOEntryID": HICMOEntryID,
- "HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
- "Czybm": sessionStorage["Czybm"],
- //"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HBillType": HBillType,
+ "HSourceInterID": HSourceInterID,
+ "HSourceEntryID": HSourceEntryID,
+ "HSourceBillNo": HSourceBillNo,
"HSourceBillType": HSourceBillType
});
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 4ac1166..803c3ad 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -272,13 +272,14 @@
<dd><a lay-href="">鐗╂枡娓呭崟缁存姢n</a></dd>
</dl>
</dd>
- <dd>
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
+ <!--<dd>
<a>宸ヨ壓璺嚎</a>
<dl class="layui-nav-child">
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">宸ヨ壓璺嚎</a></dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
</dl>
- </dd>
+ </dd>-->
</dl>
</li>
<!-- 鐢熶骇绠＄悊 -->
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index f5f5833..85ec88b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -49,9 +49,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
index 7e86aed..117e98a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -294,7 +294,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_WorkCenter/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
dataType: "json",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index bb06066..c47fa11 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -289,7 +289,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_Group/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
//url:"http://localhost:30552/Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 0d7f46a..3b1200c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -412,7 +412,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_Process/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
dataType: "json",
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 792d0a6..0644ed9 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"
@@ -140,7 +140,7 @@
<div class="layui-inline">
<label class="layui-form-label">璁㈠崟鏁伴噺:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HWorkQty" id="HWorkQty" disabled autocomplete="off">
+ <input class="layui-input" name="HPlanQty" id="HPlanQty" disabled autocomplete="off">
</div>
</div>
</div>
@@ -156,7 +156,11 @@
<div class="layui-inline">
<label class="layui-form-label">娴佽浆鍗″彿:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HProcName" lay-verify="HProcName" id="HProcName" disabled autocomplete="off">
+ <input class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" disabled autocomplete="off">
+ <input id="HSourceInterID" name="HSourceInterID" type="hidden" />
+ <input id="HSourceEntryID" name="HSourceEntryID" type="hidden" />
+ <input type="hidden" name="HSourceBillNo" id="HSourceBillNo">
+ <input type="hidden" name="HSourceBillType" id="HSourceBillType">
</div>
</div>
<div class="layui-inline">
@@ -171,8 +175,11 @@
<div class="layui-inline">
<label class="layui-form-label">浜у搧浠ｇ爜</label>
<div class="layui-input-inline">
- <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" disabled autocomplete="off">
- <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" disabled autocomplete="off">
+ <input type="text" name="HMaterCode" id="HMaterCode" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" id="HMaterList" 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">
@@ -193,7 +200,7 @@
<div class="layui-inline">
<label class="layui-form-label">娴佽浆鍗℃暟閲�:</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HMaterName" lay-verify="HMaterName" id="HMaterName" disabled autocomplete="off">
+ <input class="layui-input" name="HProcExchQty" lay-verify="HProcExchQty" id="HProcExchQty" disabled autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -390,14 +397,6 @@
function set_InitFrom() {
//鏃ユ湡鏃堕棿閫夋嫨鍣�
laydate.render({
- elem: '#HBeginDate'
- , type: 'datetime'
- });
- laydate.render({
- elem: '#HEndDate'
- , type: 'datetime'
- });
- laydate.render({
elem: '#HDate'
, type: 'datetime'
});
@@ -433,33 +432,31 @@
//鏈夋簮鍗曟柊澧�
function set_AddNew() {
refSav = "Add";
- //鍒濆鍩烘湰淇℃伅璧嬪��
+ //鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HBeginDate").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);
- $('#HBeginDate').attr("disabled", true);
+ $('#HPlanQty').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);
- $('#HDeptName').attr("disabled", true);
- $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#SourceType').attr("disabled", true);
- form.render('select');
- $('#HICMOBillNo').attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
$.ajax(
{
type: "GET",
- url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/Sc_MaterToSourceBill/GetMESMaterToSourceFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: {
"HSourceInterID": HSourceInterID,
@@ -480,15 +477,18 @@
$("#HMaterSpec").val(LoadData[0].HModel); //浜у搧瑙勬牸
$("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
- $("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
- $("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
- $("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
- $("#HMainSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
- $("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
+ $("#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); //鐢熶骇璁㈠崟
+ $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟鍙�
+ $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁㈠崟鏁伴噺
+
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -585,15 +585,15 @@
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("0");
$("#HBillNo").val("");
- //$.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // data: { "HBillType": '3787' },
- // success: function (d) {
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HInterID").val(0);
- // }
- //});
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3786' },
+ success: function (d) {
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInterID").val(0);
+ }
+ });
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 3e9a624..c4e4a22 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -320,26 +320,33 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var hmainid = data[0].hmainid;
- var ajaxLoad = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
- type: "GET",
- data: { "HInterID": hmainid },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
+ type: "GET",
+ data: { "HInterID": hmainid },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(wait);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 26ddc86..34e6e28 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -376,7 +376,7 @@
}
else if (OperationType == 3) {//缂栬緫
RoadBillMain(linterid);
- RoadBillSub(linterid);
+ //RoadBillSub(linterid);
}
else if (OperationType == 4) {//娴忚
@@ -721,11 +721,14 @@
//閫�鍑烘寜閽�
form.on('submit(Cancel)', function () {
if (OperationType == 1) {
- Pub_Close(2);
+ Pub_Close(1);
}
else if (OperationType == 2) {
Pub_Close(1);
}
+ else if (OperationType == 3) {
+ Pub_Close(1);
+ }
})
});
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index fa21150..c28c9be 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -284,7 +284,7 @@
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '宸ヤ綔涓績-鏂板'
+ , title: '宸ヨ壓璺嚎-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType='
})
@@ -302,7 +302,7 @@
layer.open({
type: 2
, area: ['100%', '100%']
- , title: '宸ヤ綔涓績-缂栬緫'
+ , title: '宸ヨ壓璺嚎-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
})
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index 090f0db..1d23577 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -8,7 +8,12 @@
<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/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
@@ -54,10 +59,12 @@
</div>
<table class="" 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-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
- </div>
+ <div class="layui-btn-container">
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
</script>
</form>
</div>
@@ -66,10 +73,10 @@
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
<script>
var _cur_page = 1;
var sql = " ";
@@ -138,6 +145,8 @@
//layui.code();
RoadHBillNo(sql);
layer.load(3)
+ $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
//鏂规硶绾ф覆鏌�
table.render({
elem: '#mainTable'
@@ -187,10 +196,34 @@
}
});
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBillNo").val("");
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+ sqlWhere = "";
+ }
+ //#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -208,7 +241,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?hID=' + hID
+ , content: ['../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=&HICMOEntryID=0', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -225,76 +258,125 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
- type: "GET",
- data: { "HInterID": InterID },
- success: function (result) {
- console.log('gouba' + result);
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var index = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
+ type: "GET",
+ data: { "HInterID": InterID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(index);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
- break;
+ break;
+ case 'get_Refresh':
+ set_ClearQuery();
+ RoadHBillNo(sqlWhere);
+ break;
+ case 'get_Exit':
+ Pub_Close(2);
+ break;
};
});
-
-
- ///鍔犺浇鏄剧ず鏁版嵁
+ //#region 鏌ヨ
function RoadHBillNo(sqlWhere) {
- where = sqlWhere;
+ var ajaxLoad = layer.load();
$.ajax({
type: "get",
- url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+ url: GetWEBURL() + "/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
async: true,
data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
success: function (result) {
if (result.count == 1) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , page: {
- curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
- }
- , loading: false
- , done: function (index, res) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , page: {
+ curr: _cur_page // 蹇呴』浠庣 1 椤靛紑濮�
+ }
+ , loading: false
+ , done: function (index, res) {
- }
- });
- layer.close(index0);
- } else {
- layer.close(index0);
+ }
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
layer.alert(result.code + result.Message, { icon: 5 });
- }
+ }
},
error: function (result) {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- };
- form.on('submit(f_Query)', function (data) {//鏌ヨ
+ }
+ //#endregion
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ //function RoadHBillNo(sqlWhere) {
+ // where = sqlWhere;
+ // var ajaxLoad = layer.load();
+ // $.ajax({
+ // type: "get",
+ // url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+ // async: true,
+ // data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+ // success: function (result) {
+ // if (result.count == 1) {
+ // ajaxReturage /nData = JSON.parse(JSON.stringify(result)).data;
+ // table.reload('mainTable', {
+ // data: ajaxReturnData
+ // , height: 'full-10'
+ // , page: {
+ // curr: _cur_p/蹇呴』浠庣 1 椤靛紑濮�
+ // }
+ // , loading: false
+ // , done: function (index, res) {
+
+ // }
+ // });
+ // layer.close(ajaxLoad);
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+
+ // },
+ // error: function (result) {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //};
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
var sqlWhere = " and 1=1 ";
//if ($("#HStatus").val() != "")
// sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
@@ -306,34 +388,19 @@
var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
if (HBillNo)
- sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
+ sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
- //if ($("#HClStatus").val() != "")
- // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
- //if ($("#HPURCHASEORGID").val() != "")
- // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
}
if (HDate2) {
sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
}
- //if ($("#HISGenerate").val() != "") {
- // if ($("#HISGenerate").val() == "鏄�")
- // {
- // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
- // }
- // else if ($("#HISGenerate").val() == "鍚�") {
- // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
- // }
- //}
-
-
var Time = $("#Time").val();
var dd = new Date();
var dt;
@@ -367,7 +434,85 @@
//浠庣涓�椤靛紑濮�
_cur_page = 1;
RoadHBillNo(sqlWhere);
- });
+ sqlWhere = "";
+ }
+ //#endregion
+
+
+ //form.on('submit(f_Query)', function (data) {//鏌ヨ
+ // var sqlWhere = " and 1=1 ";
+ // //if ($("#HStatus").val() != "")
+ // // sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+ // var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ // var HNumber = $("#HNumber").val();//鐗╂枡浠ｇ爜
+ // var HName = $("#HName").val();//鐗╂枡鍚嶇О
+ // var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+ // var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
+ // var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+
+ // if (HBillNo)
+ // sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
+ // if (HNumber)
+ // sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
+ // if (HName)
+ // sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ // if (HModel)
+ // sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ // //if ($("#HClStatus").val() != "")
+ // // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+ // //if ($("#HPURCHASEORGID").val() != "")
+ // // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+ // if (HDate1) {
+ // sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+ // }
+ // if (HDate2) {
+ // sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
+ // }
+ // //if ($("#HISGenerate").val() != "") {
+ // // if ($("#HISGenerate").val() == "鏄�")
+ // // {
+ // // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+ // // }
+ // // else if ($("#HISGenerate").val() == "鍚�") {
+ // // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+ // // }
+ // //}
+
+
+ // var Time = $("#Time").val();
+ // var dd = new Date();
+ // var dt;
+ // switch (Time) {
+ // case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+ // case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+ // case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+ // case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+ // case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+ // case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+ // case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+ // default: dd = new Date(dd.setDate(dd.getDate()));
+ // }
+ // dt = dd.getFullYear().toString();
+ // if (dd.getMonth() + 1 < 10) {
+ // dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ // }
+ // else {
+ // dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ // }
+ // if (dd.getDate() < 10) {
+ // dt = dt + "-0" + dd.getDate().toString();
+ // }
+ // else {
+ // dt = dt + "-" + dd.getDate().toString();
+ // }
+ // //if (Time != 8) {
+ // // sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ // //}
+ // sql = sqlWhere;
+ // //浠庣涓�椤靛紑濮�
+ // _cur_page = 1;
+ // RoadHBillNo(sqlWhere);
+ //});
var $ = layui.$, active = {
f_Query: function () { //鏌ヨ
@@ -393,6 +538,15 @@
// });
//}
};
+ //閫�鍑烘寜閽�
+ form.on('submit(get_Exit)', function () {
+ if (OperationType == 1) {
+ Pub_Close(2);
+ }
+ else if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ })
$('.test-table-reload-btn .layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
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 b3ff9f5..d1ca413 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"
@@ -120,7 +120,7 @@
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<input type="hidden" name="HCenterID" id="HCenterID" value="0">
@@ -765,18 +765,18 @@
});
//閫夋嫨宸ヤ綔涓績寮圭獥
form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
- //layer.open({
- // type: 2
- // , area: ['80%', '80%']
- // , title: '宸ヤ綔涓績'
- // , shade: 0.6 //閬僵閫忔槑搴�
- // //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
- // , resize: false
- // , cancel: function (index, layero) {
- // }
- //})
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ヤ綔涓績'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
layer.msg('绂佹閫夋嫨');
});
//閫夋嫨鎿嶄綔鍛�
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_StationOutBillList.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_StationOutBillList.html"
index d7802ac..3fab72d 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_StationOutBillList.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_StationOutBillList.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -61,6 +62,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
@@ -73,9 +80,9 @@
</div>
</div>
</div>
- </div>
</div>
</div>
+
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -131,6 +138,40 @@
get_FastQuery();
});
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#HProcExchBillNo').on('keydown', function (event) {
+ var HProcExchBillNo = $('#HProcExchBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HProcExchBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
option = {
@@ -183,7 +224,7 @@
//鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
- $('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
+ //$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
$('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
@@ -202,7 +243,7 @@
case 'btn-Edit': set_ShowBill();
break;
//鍒犻櫎
- case 'btn-Delete': layer.msg('鍒犻櫎');
+ case 'btn-Delete': btn_Delete();
break;
//瀹℃牳
case 'btn-Audit': set_CheckBill();
@@ -304,6 +345,7 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
+ $("#HWorkBillNo").val();
$("#HBillNo").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -313,8 +355,20 @@
//蹇�熻繃婊�
function get_FastQuery() {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HWorkBillNo = $("#HWorkBillNo").val();
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -365,10 +419,41 @@
});
}
+ //鍒犻櫎鍗曟嵁
+ function btn_Delete() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ layer.confirm('纭畾鍒犻櫎' + data[0].鍗曟嵁鍙� + '鍚楋紵', function (index) {
+ var ajaxLoad = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
+ type: "GET",
+ data: { "HInterID": data[0].HInterID, "HDeleteMan": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ get_FastQuery();
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(index);
+ });
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
//閫�鍑�
function get_Exit() {
- parent.layui.admin.events.closeThisTabs();
+ Pub_Close(2);
}
//浠ヤ笂鏄痩ayui妯″潡
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/Sc_StationOutBill_Mul.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/Sc_StationOutBill_Mul.html"
index b462e8b..33bb49a 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/Sc_StationOutBill_Mul.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/Sc_StationOutBill_Mul.html"
@@ -475,6 +475,7 @@
if (result.count == 1) {
layer.close(index);
layer.msg("鎵爜鍑虹珯鎴愬姛锛�", { icon: 6 });
+ $("#HBarCode").val("");
HMainEntryRow++;
HqtyBill++;
$("#HqtyBill").val(HqtyBill);
@@ -513,7 +514,7 @@
var ajaxLoad = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/Cj_StationInBill/del_StationInBill',
+ url: GetWEBURL() + '/Cj_StationOutBill/del_StationOutBill',
type: "GET",
data: { "HInterID": rowData.HInterID, "HDeleteMan": sessionStorage["HUserName"] },
success: function (result) {
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 62fc164..aa0adab 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"
@@ -188,10 +188,20 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <button type="button" class="layui-btn" lay-submit="" lay-filter="HWorkingProcedure-BT" id="HWorkingProcedure-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
<input type="hidden" name="HCenterID" id="HCenterID" value="0">
</div>
</div>
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -912,6 +922,22 @@
}
})
});
+ //閫夋嫨宸ヤ綔涓績寮圭獥
+ form.on('submit(HWorkingProcedure-BT)', function () {//閫夋嫨宸ヤ綔涓績
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '宸ヤ綔涓績'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ //layer.msg('绂佹閫夋嫨');
+ });
//閫夋嫨渚涘簲鍟�
form.on('submit(btnSearchSup)', function () {
@@ -980,6 +1006,11 @@
$("#HEmpName").val(obj[0].HName);
$("#HEmpID").val(obj[0].HItemID);
}
+ //杩斿洖宸ヤ綔涓績
+ function GetWorkCenterValue(obj) { //杩斿洖宸ヤ綔涓績
+ $("#HCenterName").val(obj[0].宸ヤ綔涓績);
+ $("#HCenterID").val(obj[0].HItemID);
+ }
</script>
</body>
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_StationInBillList.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_StationInBillList.html"
index 20b3e79..6b4fd75 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_StationInBillList.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_StationInBillList.html"
@@ -63,6 +63,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曞彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="宸ュ簭娴佽浆鍗″彿" id="宸ュ簭娴佽浆鍗″彿">
@@ -77,8 +89,8 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
@@ -127,6 +139,40 @@
get_FastQuery();
});
+ //鐢熶骇璁㈠崟鍥炶溅鏂规硶
+ $('#HWorkBillNo').on('keydown', function (event) {
+ var HWorkBillNo = $('#HWorkBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HWorkBillNo) {
+ layer.msg("浠诲姟鍗曞彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //鍗曟嵁鍙峰洖杞︽柟娉�
+ $('#HBillNo').on('keydown', function (event) {
+ var HBillNo = $('#HBillNo').val();
+ if (event.keyCode == 13) {
+ if (!HBillNo) {
+ layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌猴紒")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+ //宸ュ簭娴佽浆鍗″洖杞︽柟娉�
+ $('#宸ュ簭娴佽浆鍗″彿').on('keydown', function (event) {
+ var HStepBillNo = $('#宸ュ簭娴佽浆鍗″彿').val();
+ if (event.keyCode == 13) {
+ if (!HStepBillNo) {
+ layer.msg("宸ュ簭娴佽浆鍗″彿涓嶈兘涓虹┖锛�")
+ return;
+ }
+ $("#btnSearch").click();
+ }
+ });
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -143,7 +189,7 @@
case 'btn-Audit': set_CheckBill();
break;
//鍙嶅鏍�
- case 'btn-DeAudit': layer.msg('鍙嶅鏍革紒');
+ case 'btn-DeAudit': set_AbandonCheck();
break;
//棣栨
case 'btn-FirstPieceCheck': set_FirstPieceCheck();
@@ -217,8 +263,8 @@
function btnIs() {
//$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
//$('#btn-Delete').addClass("layui-btn-disabled").attr("disabled", true);//鍒犻櫎鎸夐挳
- $('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
- $('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
+ //$('#btn-Audit').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳
+ //$('#btn-DeAudit').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽�
$('#btn-Print').addClass("layui-btn-disabled").attr("disabled", true);//棰勮鎸夐挳
$('#btn-Cell').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍒楀鎸夐挳
$('#btn-RefreshCell').addClass("layui-btn-disabled").attr("disabled", true);//榛樿鍒楀鎸夐挳
@@ -306,9 +352,11 @@
function get_FastQuery() {
var HStatus = $("select[name='HStatus']").val();//鐘舵��
var 宸ュ簭娴佽浆鍗″彿 = $("#宸ュ簭娴佽浆鍗″彿").val();
+ var HWorkBillNo = $("#HWorkBillNo").val(); //浠诲姟鍗曞彿
+ var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
- if (宸ュ簭娴佽浆鍗″彿) {
+ if (宸ュ簭娴佽浆鍗″彿) {
sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + 宸ュ簭娴佽浆鍗″彿 + "%'";
}
if (HBeginDate) {
@@ -316,6 +364,12 @@
}
if (HEndDate) {
sWhere += " and CONVERT(varchar(100),杩涚珯鏃堕棿, 23) <= '" + HEndDate + "'";
+ }
+ if (HWorkBillNo) {
+ sWhere += " and 浠诲姟鍗� like '%" + HWorkBillNo + "%'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
if (HStatus) {
switch (HStatus) {
@@ -339,6 +393,8 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
+ $("#HWorkBillNo").val();
+ $("#HBillNo").val("");
$("#宸ュ簭娴佽浆鍗″彿").val("");
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -424,7 +480,7 @@
, shade: 0.6
, maxmin: false
, anim: 0
- , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=' + 3790, 'yes']
+ , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=' + OperationType + '&linterid=' + linterid + '&HSouceBillType=3790&HICMOEntryID=0', 'yes']
, resize: false
, cancel: function () {
btnIs();
@@ -440,7 +496,7 @@
//閫�鍑�
function get_Exit() {
- parent.layui.admin.events.closeThisTabs();
+ Pub_Close(2);
}
//瀹℃牳
@@ -456,7 +512,7 @@
url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
- if (result.count == 0) {
+ if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
get_FastQuery(table, option);
} else {
@@ -474,6 +530,36 @@
}
}
+ //鍙嶅鏍�
+ function set_AbandonCheck() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cj_StationInBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 });
+ get_FastQuery(table, option);
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
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/Sc_StationInBill_Mul.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/Sc_StationInBill_Mul.html"
index 76cba32..ef5c2c3 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/Sc_StationInBill_Mul.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/Sc_StationInBill_Mul.html"
@@ -430,6 +430,7 @@
if (result.count == 1) {
layer.close(index);
layer.msg("鎵爜杩涚珯鎴愬姛锛�", { icon: 6 });
+ $("#HBarCode").val("");
HMainEntryRow++;
HqtyBill++;
$("#HqtyBill").val(HqtyBill);
--
Gitblit v1.9.1