From f9f6100da86639f99df50c2885e42968d0a74ea8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 06 六月 2025 16:20:32 +0800
Subject: [PATCH] 合并冲突
---
WebTM/views/基础资料/公用基础资料/grf/法律标签.grf | 1330 +++++++++++
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 339 +-
WebTM/views/JiaShiCang_QiaoYi.html | 2
WebTM/views/生产管理/日计划报表/ReportMOMaterReadysBillList.html | 6
WebTM/views/基础资料/公用基础资料/Gy_Material.html | 2
WebTM/views/模治具管理/模治具管理/Gy_MouldFile.html | 106
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 9
WebTM/views/模治具管理/模治具管理/Gy_MouldFileList.html | 75
WebTM/views/生产管理/生产计划平台/Sc_ShopCalendar.html | 2
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 3
WebTM/views/生产管理/客户标签/Sc_CustomerTagBarCodeList.html | 1191 ++++++++++
WebTM/views/基础资料/生产基础资料/Gy_Process_Excel.html | 10
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/生产管理/日计划报表/JIT_DayPlanPlatFormHistoryNoteReport.html | 724 ++++++
WebTM/views/基础资料/基础资料/Gy_MouldStatusEdit.html | 179 +
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 8
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 8
WebTM/views/grf/法律标签.grf | 1330 +++++++++++
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html | 350 ++
WebTM/views/生产管理/客户标签/Sc_CustomerTagInfoList.html | 102
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatFormImport.html | 7
WebTM/views/生产管理/生产计划平台/Sc_BulkEditWorkTimeNew.html | 158
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/基础资料/Gy_MouldStatus.html | 659 +++++
WebTM/views/基础资料/公用基础资料/Gy_MouldType.html | 456 +++
WebTM/views/基础资料/公用基础资料/Gy_StockPlace_List.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 69
WebTM/WebTM.csproj | 3
30 files changed, 6,680 insertions(+), 460 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index 92cec76..c224f98 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.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|2025-05-30T01:25:55.8349264Z;False|2025-05-30T09:25:33.7512390+08:00;True|2025-05-29T13:19:09.3041429+08:00;False|2025-05-29T13:18:52.3875953+08:00;True|2025-05-28T18:34:06.8273247+08:00;True|2025-05-28T18:31:05.4364474+08:00;True|2025-05-28T18:27:41.8513807+08:00;True|2025-05-28T18:20:47.6240772+08:00;False|2025-05-28T18:20:38.0301633+08:00;True|2025-05-28T15:45:55.3418948+08:00;True|2025-05-28T15:44:59.7156409+08:00;True|2025-05-28T15:43:03.0458642+08:00;True|2025-05-28T15:40:55.1488977+08:00;True|2025-05-28T15:25:49.1288443+08:00;True|2025-05-28T14:35:05.2561044+08:00;True|2025-05-28T09:39:05.7154902+08:00;False|2025-05-28T09:38:43.0839585+08:00;True|2025-05-26T19:34:53.6400925+08:00;True|2025-05-26T19:19:09.7485729+08:00;True|2025-05-26T19:16:13.4436032+08:00;True|2025-05-26T19:15:41.5587345+08:00;True|2025-05-26T19:13:28.2496521+08:00;True|2025-05-26T19:11:13.9374078+08:00;True|2025-05-26T19:08:26.7288220+08:00;True|2025-05-26T19:07:41.6174469+08:00;True|2025-05-26T19:07:17.8455284+08:00;True|2025-05-26T19:03:18.8383293+08:00;True|2025-05-26T19:02:38.1409352+08:00;True|2025-05-26T18:04:23.0851072+08:00;True|2025-05-26T18:00:37.9490175+08:00;True|2025-05-26T17:36:14.9186618+08:00;True|2025-05-26T17:04:56.2652242+08:00;True|2025-05-26T17:03:32.3788117+08:00;True|2025-05-26T17:01:11.8316740+08:00;True|2025-05-26T16:54:02.0120204+08:00;True|2025-05-26T16:50:36.6739590+08:00;True|2025-05-26T16:20:54.0793563+08:00;True|2025-05-26T16:19:13.4466564+08:00;True|2025-05-26T16:18:37.0522011+08:00;True|2025-05-26T16:10:07.6439971+08:00;True|2025-05-26T16:07:37.9881606+08:00;True|2025-05-26T15:58:45.5790885+08:00;True|2025-05-26T15:57:39.8957333+08:00;True|2025-05-26T15:56:04.5332484+08:00;True|2025-05-26T15:54:08.6770273+08:00;True|2025-05-26T15:51:31.9863077+08:00;True|2025-05-26T14:17:37.4566639+08:00;True|2025-05-26T14:14:45.6478856+08:00;True|2025-05-26T14:13:32.3061443+08:00;True|2025-05-26T14:09:53.7668953+08:00;True|2025-05-26T14:08:53.7195888+08:00;True|2025-05-26T14:06:33.9160028+08:00;True|2025-05-26T09:43:55.0924210+08:00;True|2025-05-26T09:17:54.8815561+08:00;False|2025-05-26T09:17:46.0326457+08:00;True|2025-05-23T10:23:17.1057955+08:00;True|2025-05-23T10:22:31.7938776+08:00;False|2025-05-23T10:22:01.3464796+08:00;False|2025-05-23T10:21:56.8447978+08:00;True|2025-05-23T10:04:53.2423852+08:00;False|2025-05-23T10:04:21.9568682+08:00;True|2025-05-22T13:39:26.7824978+08:00;True|2025-05-22T12:19:49.9134386+08:00;False|2025-05-22T12:18:56.4955831+08:00;True|2025-05-22T09:31:52.8998426+08:00;False|2025-05-22T09:31:31.5103211+08:00;True|2025-05-21T21:36:19.8162653+08:00;True|2025-05-21T21:33:04.3951416+08:00;True|2025-05-21T21:31:06.3835951+08:00;True|2025-05-21T21:27:11.7590428+08:00;False|2025-05-21T21:26:18.2096217+08:00;True|2025-05-21T10:13:15.7576895+08:00;True|2025-05-21T10:08:35.9305095+08:00;False|2025-05-21T10:08:06.4393322+08:00;True|2025-05-20T20:52:06.7190772+08:00;False|2025-05-20T20:51:27.6441551+08:00;True|2025-05-20T10:50:39.3347667+08:00;True|2025-05-20T10:47:24.1628977+08:00;True|2025-05-20T10:42:22.4420459+08:00;True|2025-05-20T10:32:16.8802462+08:00;True|2025-05-20T10:20:12.5700338+08:00;False|2025-05-20T10:19:04.0954824+08:00;True|2025-05-19T10:08:49.0227698+08:00;True|2025-05-19T10:07:02.6110035+08:00;True|2025-05-19T10:05:49.7223902+08:00;True|2025-05-19T09:59:20.9398247+08:00;True|2025-05-19T09:58:31.8629178+08:00;False|2025-05-19T09:57:34.9251908+08:00;True|2025-05-17T12:01:30.1645467+08:00;True|2025-05-17T12:00:32.2339947+08:00;True|2025-05-17T11:55:19.4680460+08:00;True|2025-05-17T11:30:39.9716640+08:00;True|2025-05-17T11:24:41.2103791+08:00;False|2025-05-17T11:24:01.4177591+08:00;True|2025-05-16T16:04:53.4865079+08:00;True|2025-05-16T16:01:42.2978627+08:00;True|2025-05-16T15:59:07.5525777+08:00;True|2025-05-16T12:53:01.9848534+08:00;False|2025-05-16T12:52:37.5899807+08:00;True|2025-05-15T20:18:19.1959577+08:00;True|2025-05-15T20:16:31.3601343+08:00;False|2025-05-15T20:16:14.8877379+08:00;True|2025-05-15T17:13:41.3961273+08:00;True|2025-05-15T16:51:14.1735434+08:00;True|2025-05-15T16:40:38.1341678+08:00;True|2025-05-15T16:23:55.7504003+08:00;True|2025-05-15T15:39:08.0682854+08:00;True|2025-05-15T14:13:21.2837860+08:00;True|2025-05-15T13:36:02.4058882+08:00;True|2025-05-15T13:28:29.8243952+08:00;True|2025-05-15T10:26:14.6137519+08:00;True|2025-05-15T10:21:16.4378162+08:00;False|2025-05-15T10:20:39.3117941+08:00;False|2025-05-14T12:58:11.4083857+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
+ <History>True|2025-06-03T05:52:07.1079154Z;True|2025-06-03T13:49:11.2716577+08:00;False|2025-06-03T13:48:57.9281643+08:00;True|2025-06-03T11:18:21.4569758+08:00;False|2025-06-03T11:18:07.8434917+08:00;True|2025-05-30T18:18:39.6790199+08:00;True|2025-05-30T17:24:04.4308054+08:00;False|2025-05-30T17:23:44.2185988+08:00;True|2025-05-30T13:38:42.3276312+08:00;False|2025-05-30T13:38:10.6641683+08:00;True|2025-05-29T21:02:08.7526803+08:00;True|2025-05-29T20:56:45.6961143+08:00;True|2025-05-29T20:53:29.1928696+08:00;True|2025-05-29T20:48:41.0753131+08:00;True|2025-05-29T20:47:39.4592900+08:00;False|2025-05-29T20:47:21.6373829+08:00;True|2025-05-29T19:18:37.5414457+08:00;False|2025-05-29T19:18:06.4669819+08:00;True|2025-05-27T17:38:30.0202233+08:00;True|2025-05-27T17:34:08.8389758+08:00;True|2025-05-27T17:25:48.3447106+08:00;True|2025-05-27T17:24:18.7197979+08:00;True|2025-05-27T17:23:45.6999489+08:00;True|2025-05-27T17:22:56.7929287+08:00;True|2025-05-27T17:07:34.6022899+08:00;False|2025-05-27T17:07:21.9587517+08:00;True|2025-05-27T09:45:59.6087903+08:00;True|2025-05-27T09:42:09.8116162+08:00;True|2025-05-27T09:40:19.4804879+08:00;False|2025-05-27T09:40:07.5420270+08:00;True|2025-05-23T13:19:56.1160414+08:00;False|2025-05-23T13:19:15.5665172+08:00;True|2025-05-22T18:47:12.6478259+08:00;False|2025-05-22T18:46:58.6204821+08:00;True|2025-05-22T11:29:33.4628422+08:00;False|2025-05-22T11:29:19.1348633+08:00;True|2025-05-21T20:11:47.4089879+08:00;False|2025-05-21T20:11:15.9367902+08:00;True|2025-05-20T14:36:04.5285747+08:00;True|2025-05-20T14:32:59.6946516+08:00;True|2025-05-20T14:30:17.7059834+08:00;True|2025-05-20T14:00:46.8628044+08:00;False|2025-05-20T14:00:30.8172162+08:00;True|2025-05-15T09:29:53.8779796+08:00;True|2025-05-15T09:28:42.9031629+08:00;True|2025-05-15T09:19:56.6850148+08:00;False|2025-05-15T09:19:45.4832154+08:00;True|2025-05-14T17:10:12.1624443+08:00;True|2025-05-14T17:04:24.8117731+08:00;False|2025-05-14T17:04:11.8894296+08:00;True|2025-05-12T14:50:43.8597590+08:00;True|2025-05-12T14:49:30.3804017+08:00;True|2025-05-12T14:48:03.2840418+08:00;True|2025-05-12T14:42:34.0175151+08:00;True|2025-05-12T14:18:35.7040820+08:00;False|2025-05-12T14:18:11.9116245+08:00;True|2025-05-08T08:31:43.5395992+08:00;False|2025-05-08T08:31:30.1597532+08:00;True|2025-05-07T11:16:08.3590558+08:00;True|2025-05-07T11:07:22.5289193+08:00;False|2025-05-07T11:07:10.3490560+08:00;True|2025-04-28T14:17:46.1195687+08:00;False|2025-04-28T14:17:33.6141850+08:00;True|2025-04-26T10:25:49.2995847+08:00;True|2025-04-26T10:24:07.9076338+08:00;True|2025-04-26T10:19:19.5510817+08:00;True|2025-04-26T10:17:29.6990878+08:00;True|2025-04-26T10:08:36.0209336+08:00;False|2025-04-26T10:08:23.3437553+08:00;True|2025-04-22T09:20:49.3736316+08:00;True|2025-04-22T09:00:50.9347925+08:00;False|2025-04-22T09:00:33.2771403+08:00;True|2025-04-18T16:58:37.3251028+08:00;False|2025-04-18T16:58:06.8433100+08:00;False|2025-04-18T12:44:40.1660490+08:00;True|2025-04-17T09:55:34.1580504+08:00;True|2025-04-17T09:53:57.7138023+08:00;True|2025-04-17T08:09:58.6602026+08:00;False|2025-04-17T08:09:47.0841532+08:00;True|2025-04-16T10:32:52.7679790+08:00;False|2025-04-16T10:32:40.0727445+08:00;True|2025-04-15T15:29:30.4249752+08:00;True|2025-04-15T15:11:41.4886869+08:00;True|2025-04-15T14:32:57.3415642+08:00;True|2025-04-15T14:29:09.2544662+08:00;True|2025-04-15T14:26:45.3527085+08:00;True|2025-04-15T13:53:46.6655955+08:00;True|2025-04-15T13:36:17.8950794+08:00;True|2025-04-15T10:21:27.2817581+08:00;True|2025-04-15T09:31:18.5018558+08:00;True|2025-04-15T09:29:02.6800394+08:00;False|2025-04-15T09:28:48.9559077+08:00;False|2025-04-14T09:56:18.5240087+08:00;True|2025-04-10T10:06:37.9809030+08:00;True|2025-04-10T08:48:28.7916834+08:00;True|2025-04-10T08:45:40.8001951+08:00;False|2025-04-10T08:45:25.3629200+08:00;True|2025-04-08T10:48:51.1571828+08:00;False|2025-04-08T10:48:38.8386891+08:00;True|2025-04-03T15:58:43.2796893+08:00;True|2025-04-03T15:50:20.2609241+08:00;True|2025-04-03T15:48:25.2894489+08:00;True|2025-04-03T15:46:11.5793596+08:00;True|2025-04-03T15:42:09.2590464+08:00;True|2025-04-03T15:40:50.3642846+08:00;True|2025-04-03T15:18:26.3396856+08:00;True|2025-04-03T15:03:23.3873491+08:00;True|2025-04-03T15:02:37.7250782+08:00;True|2025-04-03T14:57:39.4695978+08:00;True|2025-04-03T14:56:15.9777984+08:00;True|2025-04-03T14:55:02.7047484+08:00;True|2025-04-03T14:52:02.2831331+08:00;True|2025-04-03T14:50:05.3999831+08:00;True|2025-04-03T14:48:15.4688500+08:00;True|2025-04-03T14:47:09.9901017+08:00;True|2025-04-03T14:23:52.3814877+08:00;True|2025-04-03T14:13:17.5825761+08:00;True|2025-04-03T14:11:40.3625146+08:00;False|2025-04-03T14:11:26.5182988+08:00;True|2025-04-01T11:00:10.5721058+08:00;True|2025-04-01T10:56:01.3606814+08:00;True|2025-04-01T10:43:08.9754745+08:00;True|2025-04-01T09:35:49.4493062+08:00;False|2025-04-01T09:35:34.0849515+08:00;True|2025-03-28T15:37:26.0089381+08:00;True|2025-03-28T15:36:04.5827659+08:00;False|2025-03-28T15:35:29.1086723+08:00;True|2025-03-28T13:27:52.4657652+08:00;True|2025-03-28T13:24:54.2318726+08:00;False|2025-03-28T13:24:38.1132697+08:00;False|2025-03-27T15:10:21.1631628+08:00;True|2025-03-26T12:54:27.5698188+08:00;True|2025-03-26T12:52:24.3193373+08:00;True|2025-03-26T12:47:35.8464773+08:00;True|2025-03-26T12:46:39.6287204+08:00;True|2025-03-26T12:41:49.0780387+08:00;True|2025-03-26T12:26:56.1978354+08:00;True|2025-03-26T11:55:08.1689812+08:00;True|2025-03-26T10:37:46.3192080+08:00;False|2025-03-26T10:37:33.1555802+08:00;True|2025-03-25T22:59:55.4631390+08:00;True|2025-03-25T22:58:05.0153954+08:00;False|2025-03-25T22:57:34.7338996+08:00;True|2025-03-25T15:34:14.0157397+08:00;True|2025-03-25T13:16:35.4266052+08:00;True|2025-03-25T13:15:00.5978093+08:00;True|2025-03-25T13:13:05.3147340+08:00;True|2025-03-25T13:11:09.2067782+08:00;True|2025-03-25T13:10:41.9562041+08:00;True|2025-03-25T13:08:59.6162951+08:00;True|2025-03-25T13:08:22.6754824+08:00;True|2025-03-25T12:56:01.8244720+08:00;True|2025-03-25T12:54:46.4657554+08:00;True|2025-03-25T12:52:43.1914868+08:00;True|2025-03-25T12:52:14.3383697+08:00;True|2025-03-25T12:51:23.9803137+08:00;True|2025-03-25T12:48:24.5136392+08:00;False|2025-03-25T12:48:08.8520734+08:00;True|2025-03-22T09:55:01.9290646+08:00;False|2025-03-22T09:54:41.3505928+08:00;True|2025-03-21T15:44:18.6728622+08:00;True|2025-03-21T14:40:13.1127776+08:00;True|2025-03-21T14:22:04.0317926+08:00;True|2025-03-21T14:09:14.7974252+08:00;True|2025-03-21T13:56:36.0273789+08:00;True|2025-03-21T13:39:24.0514954+08:00;True|2025-03-21T13:37:45.5076171+08:00;True|2025-03-21T13:32:16.6261602+08:00;True|2025-03-21T13:30:49.3544077+08:00;True|2025-03-21T12:34:21.5766510+08:00;True|2025-03-21T12:30:15.9179513+08:00;True|2025-03-21T12:19:14.4932635+08:00;True|2025-03-21T12:17:32.1009243+08:00;True|2025-03-21T12:16:10.7444099+08:00;True|2025-03-21T12:13:48.2460484+08:00;True|2025-03-21T12:11:44.7502759+08:00;True|2025-03-21T12:09:54.1637208+08:00;True|2025-03-21T11:48:05.8579065+08:00;True|2025-03-21T11:02:28.9589745+08:00;True|2025-03-21T10:45:58.0983118+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/layui/layui.js">
@@ -29,11 +29,11 @@
</File>
<File Include="bin/WebTM.dll">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>05/30/2025 09:25:20</publishTime>
+ <publishTime>05/27/2025 17:07:27</publishTime>
</File>
<File Include="bin/WebTM.pdb">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>05/30/2025 09:25:20</publishTime>
+ <publishTime>05/27/2025 17:07:27</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>05/23/2025 09:19:17</publishTime>
@@ -1211,7 +1211,7 @@
<File Include="layuiadmin/Scripts/webConfig.js">
<publishTime>04/27/2021 13:44:39</publishTime>
<publishTime>04/30/2021 08:50:34</publishTime>
- <publishTime>05/23/2025 10:23:13</publishTime>
+ <publishTime>05/15/2025 14:45:41</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig2.js">
<publishTime>05/23/2025 09:19:17</publishTime>
@@ -1672,7 +1672,7 @@
<publishTime>05/23/2025 09:19:17</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html">
- <publishTime>05/23/2025 09:19:17</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html">
<publishTime>04/16/2021 10:32:11</publishTime>
@@ -2278,7 +2278,7 @@
<File Include="views/home/console.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/home/console111.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -2287,7 +2287,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/home/console_Mobile.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/home/console_Mobile_KaiBeiNaiTe.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -2328,7 +2328,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/indexMenu.html">
- <publishTime>05/29/2025 15:02:28</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/indexMenu_PDA.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -2364,7 +2364,7 @@
<publishTime>05/23/2025 09:19:17</publishTime>
</File>
<File Include="views/JiaShiCang_QiaoYi.html">
- <publishTime>05/23/2025 09:19:17</publishTime>
+ <publishTime>05/23/2025 10:00:11</publishTime>
</File>
<File Include="views/PlateBinding.html">
<publishTime>05/23/2025 09:19:17</publishTime>
@@ -2658,7 +2658,7 @@
<File Include="views/user/login.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/user/login2.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -2908,6 +2908,9 @@
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA_XiaBao.html">
<publishTime>05/23/2025 09:19:17</publishTime>
</File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBillList_PDA_XiaBao.html">
+ <publishTime>05/15/2025 14:44:58</publishTime>
+ </File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_CheckList_PDA.html">
<publishTime>05/23/2025 09:19:17</publishTime>
</File>
@@ -2925,6 +2928,9 @@
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html">
<publishTime>05/23/2025 09:19:17</publishTime>
+ </File>
+ <File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockBill_PDA_XiaBao.html">
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/WMS鎵爜妯″潡/鐢熶骇璋冩嫧/Kf_MoveStockStepInBillList_PDA.html">
<publishTime>05/23/2025 09:19:17</publishTime>
@@ -3164,7 +3170,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICInventory_BarCode.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:06:10</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜鎶ヨ〃/Kf_ICInventory_Mater.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3185,7 +3191,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鏉＄爜鐢熸垚/Gy_BarCodeBill.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/鐢熶骇鍏ュ簱鍗�/Kf_ProductInBillList.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3262,7 +3268,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3289,7 +3295,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/27/2025 13:43:36</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_OrderBackInfo.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3310,7 +3316,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_PreventErrMould.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_ProjectMoney.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3352,10 +3358,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
<publishTime>06/04/2021 10:35:56</publishTime>
@@ -3367,7 +3373,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkStationList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkType.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3445,16 +3451,16 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
- <publishTime>05/26/2025 16:45:25</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckNoteItem.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckNoteItem_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3463,22 +3469,22 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ConkTypeList_PDA.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Customer_Edit.html">
<publishTime>05/27/2021 01:03:32</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CusType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CusType_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3498,7 +3504,7 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>06/03/2025 15:05:41</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
<publishTime>04/29/2021 09:11:59</publishTime>
@@ -3516,13 +3522,13 @@
<publishTime>07/23/2021 15:50:32</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EnvironmentTestItem.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3552,45 +3558,39 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaintainLev.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/26/2025 15:55:57</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialCorrection.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
- </File>
- <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterialCorrection2.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 14:23:20</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 14:49:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterTypeEdit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MaterType_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 14:53:16</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderBackInfo.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_OrderLev.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PackType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PiPe.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3602,16 +3602,16 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PreventErrMould.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PreventErrMould_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoneyClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoney_ClassTree.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3622,7 +3622,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QualityStd.html">
<publishTime>05/26/2025 18:00:13</publishTime>
@@ -3654,10 +3654,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 15:42:56</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SupType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_SupType_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3666,13 +3666,13 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterType.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnitList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterUnit_Add_Edit_.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3687,7 +3687,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TemporaryArea.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit - 澶嶅埗.html">
<publishTime>05/24/2021 10:08:23</publishTime>
@@ -3695,7 +3695,7 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
<publishTime>04/25/2021 10:16:21</publishTime>
<publishTime>04/25/2021 10:16:21</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
<publishTime>04/25/2021 09:45:09</publishTime>
@@ -3705,28 +3705,28 @@
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
<publishTime>04/25/2021 10:16:21</publishTime>
<publishTime>04/25/2021 10:16:21</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_UnitConvertRateList.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 15:39:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenterDyCol.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -3735,7 +3735,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkStationList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkType.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4033,7 +4033,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_ConkReasonList_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4051,7 +4051,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClassList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemClass_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4060,31 +4060,31 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethodList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckItemMethod_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheckList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_DotCheck_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_EquipStatus.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:58</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_EquipStatusEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClass.html">
- <publishTime>05/29/2025 17:02:37</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClass.html">
- <publishTime>05/29/2025 17:02:37</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4093,7 +4093,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MaintainList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Maintain_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4117,10 +4117,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatus.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/30/2025 14:58:21</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_MouldStatusEdit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/30/2025 18:18:24</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Operator.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4177,13 +4177,13 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4192,7 +4192,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairCheckList_PDA.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4201,13 +4201,13 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClass.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairClassEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4216,7 +4216,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_RepairList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍩虹璧勬枡/Gy_Repair_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4296,10 +4296,10 @@
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ProcCommPrice.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4365,13 +4365,13 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Post.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_PostSkillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/20/2025 14:00:08</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_ProcMul.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4380,24 +4380,24 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadResult.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadResult_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadType_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4409,10 +4409,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_PostSkill_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4423,16 +4423,16 @@
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process_Excel.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/20/2025 14:35:50</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ProcMul.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ScrapReasonList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ScrapReason_Excel.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4441,7 +4441,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_ShiftsList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_SOPBill.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4458,13 +4458,13 @@
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftEdit.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_WorkShiftList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
<publishTime>04/12/2021 11:31:26</publishTime>
@@ -4536,7 +4536,7 @@
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>06/03/2025 15:14:06</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4546,7 +4546,7 @@
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4591,10 +4591,10 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鍛樺伐鎶�鑳芥竻鍗�/HR_EmployeeSkillBill.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鍛樺伐鎶�鑳芥竻鍗�/HR_EmployeeSkillBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/澶栬喘澧欏竷宸ヨ祫/Pay_PurchaseWallclothBillEdit.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4609,19 +4609,19 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/瀹氶鐢宠/Pay_ProcPriceRequestBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宀椾綅鎶�鑳芥竻鍗�/HR_PostSkillBill.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宀椾綅鎶�鑳芥竻鍗�/HR_PostSkillBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫鍗�/Pay_PayMentBill.html">
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫鍗�/Pay_PayMentBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫鎶ヨ〃/Pay_EmpPayMentSumReport.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4696,7 +4696,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28涓汉%29/Pay_SingleBalBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 09:30:33</publishTime>
@@ -4705,7 +4705,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28鍏朵粬%29/Pay_OtherBalBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Kf_BarCodeEditDlg.html">
<publishTime>09/27/2021 09:30:32</publishTime>
@@ -4714,7 +4714,7 @@
<publishTime>05/23/2025 09:19:18</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫缁撶畻鍗�%28闆嗕綋%29/Pay_GroupBalBillList.html">
- <publishTime>05/23/2025 09:19:18</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/宸ヨ祫璁＄畻/Pay_SalaryCalculate.html">
<publishTime>05/23/2025 09:19:18</publishTime>
@@ -4729,7 +4729,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/寮傚父宸ユ椂鐢宠鍗�/Pay_ErrWorkTimesRequestBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鎵ｈˉ椤圭洰璐圭敤鍗�/Pay_DuSubsidyItemBill.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -4780,7 +4780,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList_yqn.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5176,7 +5176,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA_OLD.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5212,10 +5212,10 @@
<publishTime>07/19/2021 10:10:46</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFile.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>06/03/2025 16:30:12</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>06/03/2025 16:33:48</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileResume.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5261,7 +5261,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5330,10 +5330,10 @@
<publishTime>05/28/2025 09:37:26</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>06/03/2025 15:54:42</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBillList_PDA.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainRuleBill_Excel.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5366,7 +5366,7 @@
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
<publishTime>04/30/2021 08:42:02</publishTime>
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBill.html">
<publishTime>04/13/2021 10:12:44</publishTime>
@@ -5374,31 +5374,31 @@
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">
<publishTime>04/16/2021 10:32:11</publishTime>
<publishTime>04/16/2021 10:32:11</publishTime>
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdConclusionBillMain.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdConclusionBillMainList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMain.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeBillMainList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeCheckBillMain.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdDisposeCheckBillMainList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdRequestBillMain.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdRequestBillMainList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/濮斿宸ュ崟/WW_Add_EntrustWorkOrderList.html">
<publishTime>04/30/2021 08:42:02</publishTime>
@@ -5480,10 +5480,10 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓夊崌鎺掍骇/JIT_DayPlanPlatForm.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓夊崌鎺掍骇/JIT_DayPlanPlatFormImport_SS_Sec.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5513,10 +5513,10 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/Cg_PODemandPlanConfigBillReportForLack.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/Gy_RoutingBillReportForLack.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_DayPlanPlatForm.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5528,7 +5528,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_NeedMaterPlanConfigBillReportForLack.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/瀹濆伐鎺掍骇/JIT_PickUpCalculate_BaoGong.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5549,13 +5549,13 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMain.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackCheckBillMainList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMain.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackHandleBillMainList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5567,7 +5567,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMain.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/寮傚父鍙嶉鍗�/OA_ErrMsgBackSignBillMainList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5663,7 +5663,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐骞冲彴_PDA/IpadIndex_PDA.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐骞冲彴_PDA/IpadSourceIndex_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5740,6 +5740,9 @@
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBill_Excel.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
+ <File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/JIT_DayPlanPlatFormHistoryNoteReport.html">
+ <publishTime>05/27/2025 17:38:20</publishTime>
+ </File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/JIT_FuHeFenXiReport.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
@@ -5750,16 +5753,16 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysis.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5771,13 +5774,13 @@
<publishTime>05/28/2025 09:37:26</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBillList_PDA.html">
<publishTime>04/02/2025 14:57:18</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBill_Add_Edit_PDA.html">
<publishTime>04/02/2025 17:00:41</publishTime>
@@ -5860,7 +5863,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5945,16 +5948,16 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/27/2025 15:17:47</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm_BCP.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm_TK.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm_TKNew.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -5966,7 +5969,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ShopCalendar_Excel.html">
<publishTime>04/17/2025 11:22:21</publishTime>
@@ -6023,7 +6026,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillSumSave.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6097,7 +6100,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/蹇嵎鏂瑰紡鑷畾涔�/Xt_UserFastMenu_IconSet.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6207,7 +6210,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserListEdit.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserRightQuery.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6285,7 +6288,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillCheckQuery.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6302,7 +6305,7 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
<publishTime>04/27/2021 08:56:48</publishTime>
@@ -6331,7 +6334,7 @@
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
<publishTime>04/12/2021 11:31:26</publishTime>
<publishTime>04/12/2021 11:31:26</publishTime>
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillListQuery.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6542,10 +6545,10 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillList_Detail.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6641,7 +6644,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainEdit.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6755,7 +6758,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸℃璁板綍鍗�/QC_PatrolProcCheckOtherBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ヤ綔鑱旂郴鍗�/OA_Add_Edit_WorkLinkBill.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6782,13 +6785,13 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList2.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/搴撳瓨妫�楠屽崟/QC_Add_Edit_StockCheckBill.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/搴撳瓨妫�楠屽崟/QC_StockCheckBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackBillList_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6818,7 +6821,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSelfQuery_BGT.html">
- <publishTime>05/26/2025 09:17:39</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/寮傚父鍙嶉/OA_ErrMsgBackSignBillList_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6872,10 +6875,10 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
- <publishTime>05/26/2025 18:24:43</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
- <publishTime>05/26/2025 19:03:11</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillEdit.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6887,7 +6890,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillList.html">
- <publishTime>05/26/2025 09:43:46</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/鐜妫�娴嬪崟/QC_EnvironmentTestDotCheckBillList_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -6935,7 +6938,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_InspectionFormReport.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鎶ヨ〃/QC_MoistureContentDataLedger.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -7001,13 +7004,13 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/璐ㄩ噺鏈堝害鐩爣鍗�/QC_MonthTarGetBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/杞﹂棿鑷鍗�/QC_Add_Edit_WorkSelfCheckBill.html">
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/杞﹂棿鑷鍗�/QC_WorkSelfCheckBillList.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/MES_ColorRecordBillList_PDA.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -7025,7 +7028,7 @@
<publishTime>05/23/2025 09:19:19</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList2.html">
- <publishTime>05/23/2025 09:19:19</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html">
<publishTime>05/23/2025 09:19:19</publishTime>
@@ -7982,19 +7985,19 @@
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/涓氱哗鎸囨爣/PM_YearEmployeeMoneyBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkReportWeekBillMain.html">
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkReportWeekBillMainList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkTaskWeekBill.html">
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鍛ㄨ鍒�/PM_WorkTaskWeekBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鍩虹寤烘ā/Add_Edit_Gy_ProjectClass.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8015,7 +8018,7 @@
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBillMainMy.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8042,7 +8045,7 @@
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_CustomerProInfoBillMainList.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8063,7 +8066,7 @@
<publishTime>05/28/2025 09:37:26</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectEndBillMain.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8084,10 +8087,10 @@
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectTaskNeedCheckQuery.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectTaskNeedSaveQuery.html">
- <publishTime>05/28/2025 09:37:26</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_WorkPlanMonthBillMain.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8117,7 +8120,7 @@
<publishTime>05/23/2025 09:19:20</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectReportBillList.html">
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/15/2025 14:44:59</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/椤圭洰闃舵/PM_ProjectStageBill.html">
<publishTime>05/23/2025 09:19:20</publishTime>
@@ -8428,7 +8431,7 @@
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
<publishTime>04/15/2021 16:31:28</publishTime>
<publishTime>04/15/2021 16:31:28</publishTime>
- <publishTime>05/23/2025 09:19:20</publishTime>
+ <publishTime>05/19/2025 13:51:44</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html">
<publishTime>05/23/2025 09:19:20</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f50a4a6..01ce8b9 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -616,6 +616,7 @@
<Content Include="views\鐢熶骇绠＄悊\瀹濆伐鎺掍骇\JIT_LockRequestBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoExcel.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoEdit.html" />
+ <Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagBarCodeList.html" />
<Content Include="views\鐢熶骇绠＄悊\瀹㈡埛鏍囩\Sc_CustomerTagInfoList.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞OA_ErrMsgBackSignBill_BrushCard.html" />
<Content Include="views\鐢熶骇绠＄悊\寮傚父鍙嶉鍗昞Sc_MESExecptFeedBackBillResumeList.html" />
@@ -633,6 +634,7 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬Gy_ButtonList.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind_Button.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
@@ -1400,6 +1402,7 @@
<Content Include="views\grf\鍙栨牱鍗�.grf" />
<Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<Content Include="views\grf\杩芥函鐮�.grf" />
+ <Content Include="views\grf\娉曞緥鏍囩.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index ca3bde2..9d1c732 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -11,9 +11,9 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git a/WebTM/views/JiaShiCang_QiaoYi.html b/WebTM/views/JiaShiCang_QiaoYi.html
index fb63d70..f803888 100644
--- a/WebTM/views/JiaShiCang_QiaoYi.html
+++ b/WebTM/views/JiaShiCang_QiaoYi.html
@@ -44,7 +44,7 @@
data: { "ModRightNameCheck": "KB_JiaShiCang", "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- window.open('http://192.168.1.251:9191/bi/ItemShow?uid=c29bbf75-2c4f-11ef-8594-e878ee3e73ce', '_blank');
+ window.open('http://10.10.1.5:9191/bi/ItemShow?uid=c29bbf75-2c4f-11ef-8594-e878ee3e73ce', '_blank');
//Pub_Close(2);
} else {
diff --git "a/WebTM/views/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf" "b/WebTM/views/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..e83c4c1
--- /dev/null
+++ "b/WebTM/views/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf"
@@ -0,0 +1,1330 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":7,
+ "Height":55,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鐧惧垎姣斾竴"
+ },
+ {
+ "Name":"鐧惧垎姣斾簩"
+ },
+ {
+ "Name":"鐧惧垎姣斾笁"
+ },
+ {
+ "Name":"SIZE1"
+ },
+ {
+ "Name":"SIZE2"
+ },
+ {
+ "Name":"LBS"
+ },
+ {
+ "Name":"OZ"
+ },
+ {
+ "Name":"鏃ユ湡"
+ },
+ {
+ "Name":"瑙勬牸"
+ },
+ {
+ "Name":"UPC"
+ }
+ ]
+ },
+ "ColumnContent":{
+ "Height":0
+ },
+ "ColumnTitle":{
+ "Height":0
+ }
+ },
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":55.0069,
+ "Font":{
+ "Name":"Arial",
+ "Size":105000,
+ "Weight":400
+ },
+ "Control":[
+ {
+ "Type":"Line",
+ "Name":"Line1",
+ "Left":0.211667,
+ "Top":0.211667,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":1.00542,
+ "Top":0.396875,
+ "Width":5.00063,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"UNDER PENALTY OF LAW"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":1.21708,
+ "Top":0.978958,
+ "Width":4.65667,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"THIS TAG NOT TO BE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox3",
+ "Left":0.820208,
+ "Top":1.56104,
+ "Width":6.19125,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"REMOVED EXCEPT BY THE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":2.2225,
+ "Top":2.14313,
+ "Width":2.61938,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"CONSUMER"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line2",
+ "Left":0.211667,
+ "Top":2.80458,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Left":1.42875,
+ "Top":2.98979,
+ "Width":4.65667,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"ALL NEW MATERIAL"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox6",
+ "Left":2.19604,
+ "Top":3.57188,
+ "Width":3.01625,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"consisting of"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox7",
+ "Left":0.608542,
+ "Top":4.15396,
+ "Width":4.78896,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"POLYURETHANE FOAM"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":0.608542,
+ "Top":4.73604,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"PAD鈥︹�︹�︹�︹�︹�︹�︹�︹�︹��. [#鐧惧垎姣斾竴#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox8",
+ "Left":0.608542,
+ "Top":5.31813,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"BLENDED FIBER BATTING"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":0.608542,
+ "Top":5.90021,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"鈥︹�︹�︹�︹�︹�︹�︹�︹�︹�︹�︹��.. [#鐧惧垎姣斾簩#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox9",
+ "Left":0.211667,
+ "Top":6.48229,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"(POLYESTER FIBER BATTING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox10",
+ "Left":0.608542,
+ "Top":7.06438,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"100%)"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line3",
+ "Left":0.211667,
+ "Top":7.80521,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox11",
+ "Left":1.00542,
+ "Top":7.99042,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Text":"Certification is made by the"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox12",
+ "Left":0.396875,
+ "Top":8.5725,
+ "Width":5.79438,
+ "Height":0.5821,
+ "Text":"manufacturer that the materials in"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox13",
+ "Left":0.79375,
+ "Top":9.15458,
+ "Width":5.79438,
+ "Height":0.5821,
+ "Text":"this article are described in"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox14",
+ "Left":1.40229,
+ "Top":9.73667,
+ "Width":3.99521,
+ "Height":0.5821,
+ "Text":"accordance with law"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line4",
+ "Left":0.211667,
+ "Top":10.3981,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox15",
+ "Left":2.40771,
+ "Top":10.6098,
+ "Width":2.77813,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"MADE FOR"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox16",
+ "Left":2.01083,
+ "Top":11.1919,
+ "Width":3.99521,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Symphony Sleep"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox17",
+ "Left":1.34938,
+ "Top":11.774,
+ "Width":5.00063,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"150 St Peters Centre Blvd."
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox18",
+ "Left":2.98979,
+ "Top":12.356,
+ "Width":1.5875,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Suite C"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox19",
+ "Left":1.82563,
+ "Top":12.9381,
+ "Width":4.20688,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"St Peters, MO 63376"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line5",
+ "Left":0.211667,
+ "Top":13.7583,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox20",
+ "Left":0.608542,
+ "Top":13.9965,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Date of Delivery:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox21",
+ "Left":0.608542,
+ "Top":14.5785,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Finished Size :"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox22",
+ "Left":0.608542,
+ "Top":15.1606,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Net Weight of Filling Materials"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":3.59833,
+ "Top":14.605,
+ "Width":3.59833,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"[#SIZE1#]X[#SIZE2#] In."
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":0.608542,
+ "Top":15.7427,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"[#LBS#] lbs.[#OZ#] oz"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox23",
+ "Left":0.608542,
+ "Top":22.4102,
+ "Width":2.59292,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Date of Delivery:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox5",
+ "Left":3.99521,
+ "Top":22.4102,
+ "Width":1.79917,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"[#鏃ユ湡#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox24",
+ "Left":0.608542,
+ "Top":22.7806,
+ "Width":4.60375,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Importer/US Records Location:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox25",
+ "Left":0.608542,
+ "Top":23.151,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"Innovative Sleep Technologies"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox26",
+ "Left":0.608542,
+ "Top":23.5744,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Calibri",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"150 St. Peters Centre Blvd. - Suite C"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox27",
+ "Left":0.608542,
+ "Top":23.9977,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Calibri",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"St. Peters, MO 63376"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox28",
+ "Left":0.608542,
+ "Top":24.7915,
+ "Width":1.19063,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Model:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox6",
+ "Left":3.99521,
+ "Top":24.7915,
+ "Width":1.79917,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"[#瑙勬牸#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox29",
+ "Left":0.608542,
+ "Top":25.4,
+ "Width":1.40229,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Prototype ID: "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox30",
+ "Left":3.99521,
+ "Top":25.4,
+ "Width":1.79917,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Multiple"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox31",
+ "Left":0.608542,
+ "Top":26.4054,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Bold":true
+ },
+ "Text":"FOUNDATION ID: "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox32",
+ "Left":3.59833,
+ "Top":26.4054,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Bold":true,
+ "Underline":true
+ },
+ "Text":"SSABWM-22"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line6",
+ "Left":0.211667,
+ "Top":27.596,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox33",
+ "Left":0.608542,
+ "Top":28.0723,
+ "Width":1.79917,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"Serial No."
+ },
+ {
+ "Type":"Line",
+ "Name":"Line7",
+ "Left":0.211667,
+ "Top":28.9983,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox7",
+ "Left":3.20146,
+ "Top":28.0723,
+ "Width":3.59833,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox34",
+ "Left":1.79917,
+ "Top":29.3952,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Not to be removed until"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox35",
+ "Left":1.79917,
+ "Top":29.7921,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"delivered to the consumer"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox36",
+ "Left":1.79917,
+ "Top":30.6123,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Ne pas enleveravant la"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox37",
+ "Left":1.5875,
+ "Top":31.0621,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"livraison au consommateur"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line8",
+ "Left":0.211667,
+ "Top":31.8029,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox38",
+ "Left":2.01083,
+ "Top":32.1998,
+ "Width":3.20146,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"This article contains"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox39",
+ "Left":2.01083,
+ "Top":32.5967,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"NEW MATERIAL"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox40",
+ "Left":3.01625,
+ "Top":32.9935,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"ONLY"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox41",
+ "Left":2.01083,
+ "Top":33.999,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Cet article contient des"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox42",
+ "Left":0.396875,
+ "Top":34.3958,
+ "Width":7.19667,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"MAT脡RIAUX NEUFS SEULEMENT"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line9",
+ "Left":0.211667,
+ "Top":35.1896,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox43",
+ "Left":1.19063,
+ "Top":35.4013,
+ "Width":5.21229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"This label is affixed in compliance"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox44",
+ "Left":2.19604,
+ "Top":35.8246,
+ "Width":3.20146,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"with Provincial Law"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox45",
+ "Left":1.5875,
+ "Top":36.8035,
+ "Width":4.78896,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Cette etiquette est appos茅e"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox46",
+ "Left":0.820208,
+ "Top":37.2269,
+ "Width":5.58271,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"conform茅ment 脿 la loi de la province"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line10",
+ "Left":0.211667,
+ "Top":37.9942,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox47",
+ "Left":0.396875,
+ "Top":38.2058,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Reg. No."
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox48",
+ "Left":4.20688,
+ "Top":38.2058,
+ "Width":2.38125,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"No de permis聽:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox49",
+ "Left":2.19604,
+ "Top":38.7879,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"01T-02479117"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox50",
+ "Left":2.40771,
+ "Top":39.2113,
+ "Width":1.98438,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"QC-013022"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox51",
+ "Left":2.80458,
+ "Top":39.6346,
+ "Width":1.19063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"66768"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox52",
+ "Left":0.396875,
+ "Top":40.5871,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Content"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox53",
+ "Left":3.59833,
+ "Top":40.5871,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Contenu"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox54",
+ "Left":0.211667,
+ "Top":41.1956,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"PADDING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox55",
+ "Left":3.20146,
+ "Top":41.1956,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"REMBOURRAGE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox56",
+ "Left":0.211667,
+ "Top":41.9894,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"POLYETHYLENE "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox57",
+ "Left":0.211667,
+ "Top":42.545,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"FOAM PAD"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox58",
+ "Left":3.12208,
+ "Top":42.0158,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"Mousse de"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox59",
+ "Left":3.12208,
+ "Top":42.5715,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"Poly茅phyl猫ne"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line11",
+ "Left":0.211667,
+ "Top":43.2065,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox60",
+ "Left":0.608542,
+ "Top":43.3917,
+ "Width":6.19125,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"Federal Requirement/Exigence f茅d茅rale"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox61",
+ "Left":2.40771,
+ "Top":44.3971,
+ "Width":2.19604,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"SOR/2016-194"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox62",
+ "Left":0.396875,
+ "Top":44.794,
+ "Width":6.58813,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":75000,
+ "Bold":true
+ },
+ "Text":"POLYETHYLENE FABRIC TISSU MULTICOUCHES"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox63",
+ "Left":1.50813,
+ "Top":45.4025,
+ "Width":0.820208,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"FACE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox64",
+ "Left":4.78896,
+ "Top":45.4025,
+ "Width":0.820208,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"VISAGE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox65",
+ "Left":0.608542,
+ "Top":46.011,
+ "Width":1.5875,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYESTER"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox66",
+ "Left":3.81,
+ "Top":46.011,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Polyester"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":5.79438,
+ "Top":46.011,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox67",
+ "Left":0.608542,
+ "Top":46.7783,
+ "Width":2.19604,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYURETHANE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox68",
+ "Left":3.41313,
+ "Top":46.7783,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Poly茅phyl猫ne"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox9",
+ "Left":5.79438,
+ "Top":46.7783,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox69",
+ "Left":1.19063,
+ "Top":47.8367,
+ "Width":2.2225,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"FR BACKING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox70",
+ "Left":4.39208,
+ "Top":47.8367,
+ "Width":2.01083,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":" FR SUPPORT"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox71",
+ "Left":0.608542,
+ "Top":48.4452,
+ "Width":1.5875,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYESTER"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox72",
+ "Left":3.81,
+ "Top":48.4452,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Polyester"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox10",
+ "Left":5.79438,
+ "Top":48.4452,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line12",
+ "Left":0.211667,
+ "Top":49.7946,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"Line",
+ "Name":"Line13",
+ "Left":5.3975,
+ "Top":50.8,
+ "Width":1.40229,
+ "Pen":{
+ "Width":2
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
index f3ebd3c..90185ae 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
@@ -25,18 +25,21 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
- <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
- <div class="layui-card-header">
- <div class="layui-btn-group">
-
- <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
+ <div class="layui-card-body">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="Check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Check">瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
</div>
-
- </div>
- <div class="layui-card-body">
- <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab" lay-filter="docDemoTabBrief">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鍣ㄥ叿鍒嗙被</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="layui-form-item">
@@ -67,19 +70,96 @@
<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">绂佺敤鏍囧織</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" disabled>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐖剁骇鍒嗙被</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HParentID" lay-verify="HParentID" id="HParentID" style="display:none;">
+ <input class="layui-input" name="HParentName" lay-verify="HParentName" id="HParentName" readonly>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
</div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
<div class="layui-form-item">
- <label class="layui-form-label">绂佺敤鏍囧織</label>
- <div class="layui-input-block">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+ <div class="layui-row">
+ <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+ </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMakeTime" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ </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="HModifyTime" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+ </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="HCheckTime" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HStopTime" id="HStopTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
</div>
</div>
- </div>
-
- </form>
+ </form>
+ </div>
</div>
</div>
</div>
@@ -123,6 +203,9 @@
, form = layui.form
, laydate = layui.laydate
, element = layui.element;
+
+ //缁勭粐
+ var HOrgIDBar = 0;
//#endregion
//甯歌鐢ㄦ硶
@@ -180,15 +263,45 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
});
}
else {
f_alert(data.Message);
console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ } else if (HType == "Copy") {
+ //鏂板
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Gy_ModelType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub1 },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
}
layer.closeAll("loading");
},
@@ -211,9 +324,9 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ //$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ //var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ //parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
});
}
else {
@@ -232,6 +345,16 @@
}
});
+ //瀹℃牳
+ form.on('submit(Check)', function () {
+ set_CheckBill(1);
+ })
+
+ //鍙嶅鏍�
+ form.on('submit(deCheck)', function () {
+ set_CheckBill(2);
+ })
+
//#endregion
@@ -243,12 +366,50 @@
if (HType == "Modify") {
$.ajax({
url: GetWEBURL() + "/Gy_ModelType/xg",
+ async:false,
type: "GET",
data: {
"HInterID": hID
},
success: function (d) {
-
+
+ ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+ $("#HNumber").val(d.data[0].HNumber);
+ $("#HName").val(d.data[0].HName);
+ $("#HParentID").val(d.data[0].HParentID);
+ $("#HParentName").val(d.data[0].HParentName);
+ $("#HHelpCode").val(d.data[0].HHelpCode);
+ $("#HRemark").val(d.data[0].HRemark);
+ $("#HMakeEmp").val(d.data[0].HMakeEmp);
+ $("#HMakeTime").val(d.data[0].HMakeEmp == "" ? "" :formatDate(d.data[0].HMakeTime));
+ $("#HModifyEmp").val(d.data[0].HModifyEmp);
+ $("#HModifyTime").val(d.data[0].HModifyEmp == "" ? "" :formatDate(d.data[0].HModifyTime));
+ $("#HCheckEmp").val(d.data[0].HCheckEmp);
+ $("#HCheckTime").val(d.data[0].HCheckEmp == "" ? "" :formatDate(d.data[0].HCheckTime));
+ $("#HStopEmp").val(d.data[0].HStopEmp);
+ $("#HStopTime").val(d.data[0].HStopEmp == "" ? "" :formatDate(d.data[0].HStopTime));
+ $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+ layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+
+ HOrgIDBar = d.data[0].HUSEORGID;
+
+ //$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ //table.reload(layTableId, {
+ // data: ajaxReturnData
+ //});
+ }
+
+ });
+ } else if (HType == "Copy") {
+ $.ajax({
+ url: GetWEBURL() + "/Gy_ModelType/xg",
+ async:false,
+ type: "GET",
+ data: {
+ "HInterID": hID
+ },
+ success: function (d) {
+
ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
$("#HNumber").val(d.data[0].HNumber);
$("#HName").val(d.data[0].HName);
@@ -257,7 +418,10 @@
$("#HLevel").val(d.data[0].HLevel);
$("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
- $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+ //$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+
+ HOrgIDBar = d.data[0].HUSEORGID;
+
//table.reload(layTableId, {
// data: ajaxReturnData
//});
@@ -265,6 +429,10 @@
});
}
+
+ //#region 鍒濆鍖栫粍缁�
+ Organ();
+ //#endregion
//鏁版嵁楠岃瘉
function AllowLoadData() {
@@ -284,6 +452,138 @@
return true;
}
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ if (HType == "Modify" || HType == "Copy") {
+
+ } else {
+ HOrgIDBar = sessionStorage["OrganizationID"];
+ }
+
+
+ $("#HUSEORGID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏃堕棿杞崲
+ 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('-');
+ }
+ //#endregion
+
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var HItemID = 0;
+ if (HType == "Modify") {
+ HItemID = hID;
+ } else if (HType == "Copy") {
+ //閫昏緫瀹℃牳鏂规硶
+ var sql = "select * from Gy_MouldType where HNumber = '" + $("#HNumber").val() + "' and HUSEORGID = " + $("#HUSEORGID").val() + " and convert(varchar(100),HMakeTime,23) = convert(varchar(100),getdate(),23)";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ HItemID = data1.data[0].HItemID;
+ } else {
+ layer.alert("瀹℃牳鏁版嵁涓嶅瓨鍦紝璇锋娴嬫槸鍚﹀凡缁忎繚瀛橈紒", { icon: 5 });
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ //閫昏緫瀹℃牳鏂规硶
+ var sql = "select * from Gy_MouldType where HNumber = '" + $("#HNumber").val() + "' and HUSEORGID = " + $("#HUSEORGID").val() + " and convert(varchar(100),HMakeTime,23) = convert(varchar(100),getdate(),23)";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ HItemID = data1.data[0].HItemID;
+ } else {
+ layer.alert("瀹℃牳鏁版嵁涓嶅瓨鍦紝璇锋娴嬫槸鍚﹀凡缁忎繚瀛橈紒", { icon: 5 });
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (HItemID == "0") {
+ return;
+ }
+
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Gy_MouldType/AuditGy_MouldType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HItemID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
});
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 3d70e60..01b9777 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -1235,7 +1235,8 @@
addSWhere = " and 绂佺敤鏍囪 = ' ' and 杞﹂棿鏍囪 = 'Y' ";
Organization = HOrgName.toString();
} else {
- addSWhere = " and 绂佺敤鏃堕棿 is null and 瀹℃牳浜� !='' ";
+ addSWhere = " and 绂佺敤鏍囪 = '' and 绂佺敤鏃堕棿 is null and ISNULL(瀹℃牳浜�,'') <> '' ";
+ Organization = HOrgName.toString();
}
}
return addSWhere;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
index 0a653e1..0bbc180 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Material.html"
@@ -1511,7 +1511,7 @@
var HOrgID = params[params[1]];
var openType2 = params[params[2]];//涔斾竴浣跨敤鑷埗澶栬喘杩囨护
if (typeof (openType) != "undefined") {
- sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') !=''";
+ sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> ''";
if (openType2 == "POOrder") {
sWhere += " and 鐗╂枡灞炴��='澶栬喘' "
} else if (openType2 == "SeOrder") {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
index 0342a79..247ba80 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -8,13 +8,33 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/SetColumn.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/layui/layui1.js"></script>
+ <script src="../../../layuiadmin/layui/lay/modules/table.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style>
+ /*鏍戠姸鍥剧偣鍑婚珮浜彉鑹�*/
+ .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
+ background: #aef0f7;
+ }
+ </style>
</head>
<body>
@@ -30,13 +50,12 @@
<span>鏇村</span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" 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 ForFilteringSchemes" name="HBillNo" id="HBillNo">
+ </div>
+ </div>-->
<!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
@@ -55,6 +74,14 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 300px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -68,7 +95,7 @@
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
</select>
</div>
</div>
@@ -148,20 +175,44 @@
</div>
</div>
</div>
- <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
+ <div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
+ <div style="width:99.5%;height:calc(35vh);position: relative;">
+ <!--//杞挱鍥�-->
+ <div class="layui-carousel" id="test1" style="position:absolute;">
+ <!--閫忔槑搴� opacity: 0.2-->
+ <div carousel-item id="file">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div id="page" style="position:relative;bottom:0;"></div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></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 class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-file-b"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>瀵煎叆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-view" id="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -180,7 +231,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree', 'carousel'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -191,15 +242,21 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , carousel = layui.carousel
, tree = layui.tree
, soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
+
+ var sql = "";
+ var HMaterTypeID = 0; //鐖剁骇鍒嗙被鑺傜偣id
//#endregion
var titleData = ["HMouldID", "hsubid",];
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
var HModName = "Gy_MouldType";
+ var HBillType = "Gy_MouldType";
//#region 銆愯繃婊ゆ柟妗堛��
@@ -227,6 +284,10 @@
//鏂板
case 'set_AddNew': set_AddNew();
break;
+ //澶嶅埗
+ case 'btn-Copy':
+ set_Copy();
+ break;
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
@@ -250,6 +311,22 @@
//鍙嶅鏍告寜閽�
case 'btn-DeAudit':
set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -310,12 +387,17 @@
function set_ClearBill() {
+ Organ();
+
+ //鏍戠姸鍥炬煡璇�
+ get_Display_Tree();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
ColFilter();
DisPlay_HideColumn();
get_DefaultModule();
@@ -356,23 +438,26 @@
var data = obj.data;
//鍗曟嵁鍙疯秴閾炬帴
- if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
- var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ if (obj.event == '鍣ㄥ叿鍒嗙被浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var hID = data.HItemID;
+ TagParentId = data.HParentID;
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
- layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
- type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ layer.open({
+ type: 2
, area: ['100%', '100%']
- , title: '缂栬緫' //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
- , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , title: '缂栬緫妯℃不鍏峰垎绫�'
+ , closeBtn: 1
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + linterid + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']//璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
- , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
- end: function () { //褰撳叧闂椂璋冪敤
- get_FastQuery(table, option);
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
}
- , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ , cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
}
})
@@ -408,9 +493,14 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
- } else {
+ } else if (data[i].name == '鍣ㄥ叿鍒嗙被浠ｇ爜') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍣ㄥ叿鍒嗙被浠ｇ爜', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍣ㄥ叿鍒嗙被浠ｇ爜 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ }
+ else {
switch (data[i].Type) {
//int
case 'DateTime':
@@ -425,19 +515,23 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- /* , cols: [col]*/
- , cols: [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { field: 'HItemID', title: 'HItemID', sort: true, hide: true, sort: true }
- , { field: 'HParentID', title: 'HParentID', sort: true, hide: true, sort: true }
- , { field: 'HNumber', title: '浠ｇ爜', width: 200, sort: true }
- , { field: 'HName', title: '鍚嶇О', width: 200, sort: true }
- , { field: 'HLevel', title: '绛夌骇', width: 200, sort: true }
- , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true }
- , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true }
- , { field: 'HRemark', title: '澶囨敞', width: 200, sort: true }
- , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
- ]]
+ , cols: [col]
+ //, cols: [[
+ // { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ // , { field: 'HItemID', title: 'HItemID', sort: true, hide: true, sort: true }
+ // , { field: 'HParentID', title: 'HParentID', sort: true, hide: true, sort: true }
+ // , {
+ // field: 'HNumber', title: '浠ｇ爜', width: 200, sort: true, event: '浠ｇ爜', templet: function (d) {
+ // return '<span style="color: blue;">' + d.HNumber + '</span>'
+ // }, style: 'cursor: pointer;'
+ // }
+ // , { field: 'HName', title: '鍚嶇О', width: 200, sort: true }
+ // , { field: 'HLevel', title: '绛夌骇', width: 200, sort: true }
+ // , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200, sort: true }
+ // , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200, sort: true }
+ // , { field: 'HRemark', title: '澶囨敞', width: 200, sort: true }
+ // , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200, sort: true }
+ //]]
, data: data1.data
, height: 800
, page: true
@@ -447,9 +541,16 @@
, limits: [50, 500, 5000, 20000]
, done: function (res, curr, count) {
soulTable.render(this);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
}
}
- DisPlay_HideColumn();
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
+
+
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
@@ -464,6 +565,97 @@
});
}
//#endregion
+
+ //#region 鏍戠姸鍥炬煡璇�
+ function get_Display_Tree() {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Gy_ModelType/Gy_ModelTypeTreeListByLevel',
+ type: "GET",
+ data: { "HOrgID": sessionStorage["OrganizationID"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(ajaxLoad);
+ var data = JSON.parse(data1.data);
+ MenuMain(data);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#region 閬嶅巻鐢熸垚涓昏彍鍗�
+ function MenuMain(data) {
+ var liStr = '[';
+ //閬嶅巻鐢熸垚涓昏彍鍗�
+ for (var i = 0; i < data.length; i++) {
+ // 鍒ゆ柇鏄惁瀛樺湪瀛愯彍鍗�
+ if (data[i].children != null && data[i].children.length > 0) {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
+ // 閬嶅巻鑾峰彇瀛愯彍鍗�
+ for (var k = 0; k < data[i].children.length; k++) {
+ liStr += getChildMenu(data[i].children[k], 0);
+ }
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += ']},';
+ } else {
+ liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
+ }
+ };
+ liStr = liStr.substring(0, liStr.length - 1);
+ liStr += "]";
+ var treeTable = JSON.parse(liStr);
+ tree.render({
+ elem: '#TreeTable' //榛樿鏄偣鍑昏妭鐐瑰彲杩涜鏀剁缉
+ , data: treeTable
+ , onlyIconControl: true
+ , click: function (obj) {
+ //楂樹寒鍙樿壊
+ $(".layui-tree-set").removeClass('layui-tree-set-active');
+ obj.elem.addClass('layui-tree-set-active');
+
+ var data = obj.data; //鑾峰彇褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
+ if (data.id == "100") {
+ sql = " and HParentID=0 ";
+ HParentID = 0;
+ } else if (data.id == "0") {
+ sql = "";
+ HParentID = 0;
+ } else {
+ sql = " and HParentID='" + data.id + "' ";
+ HParentID = data.id;
+ }
+ get_FastQuery()
+ }
+ });
+ }
+
+ // 閫掑綊鐢熸垚瀛愯彍鍗�
+ function getChildMenu(subMenu, num) {
+ num++;
+ var subStr = '';
+ if (subMenu.children != null && subMenu.children.length > 0) {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
+ for (var j = 0; j < subMenu.children.length; j++) {
+ subStr += getChildMenu(subMenu.children[j], num);
+ if (j + 1 == subMenu.children.length) {
+ subStr = subStr.substring(0, subStr.length - 1);
+ }
+ }
+ subStr += ']},';
+ } else {
+ subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
+ }
+ return subStr;
+ }
+ //#endregion
+
//#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
@@ -552,6 +744,8 @@
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ var HUSEORGID = $("#HUSEORGID").val();
+
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
@@ -628,11 +822,21 @@
}
if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
+ sWhere += " and 鍣ㄥ叿鍒嗙被浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
+ sWhere += " and 鍣ㄥ叿鍒嗙被鍚嶇О like '%" + HName + "%'";
}
+
+ if (HUSEORGID != "0") {
+ sWhere += " and HUSEORGID = " + HUSEORGID;
+ }
+
+ if (sql != "") {
+ sWhere += sql;
+ }
+
+ addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -836,6 +1040,150 @@
}
//#endregion
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MouldType/StopGy_MouldType", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 澶嶅埗
+ function set_Copy() {
+ if (TagId != "") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗妯℃不鍏峰垎绫�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&HType=Copy&TagParentId=' + TagParentId + '', 'yes']
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ else {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID;
+ TagParentId = data[0].HParentID;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗妯℃不鍏峰垎绫�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + hID + '&HType=Copy&TagParentId=' + TagParentId + '', 'yes']
+
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+ }
+ //#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+
+ var HOrgIDBar = sessionStorage["OrganizationID"];
+
+ $("#HUSEORGID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ if (typeof (openType) != "undefined") {
+ sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') <> ''";
+ }
+ }
+ //#endregion
+
//淇敼鎸夐挳
function set_ShowBill() {
if (TagId != "") {
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_StockPlace_List.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_StockPlace_List.html"
index ca214eb..bf86fb8 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_StockPlace_List.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_StockPlace_List.html"
@@ -511,7 +511,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof (openType) != "undefined") {
- addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+ addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index fa97079..9dc5590 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -1187,7 +1187,7 @@
var addSWhere = "";
if ((typeof(openType) != "undefined") /*&& typeof(HOrgName) != "undefined"*/) {
- addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' ";
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� <> '' ";
//Organization = HOrgName.toString();
}
return addSWhere;
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/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf" "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/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf"
new file mode 100644
index 0000000..e83c4c1
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/grf/\346\263\225\345\276\213\346\240\207\347\255\276.grf"
@@ -0,0 +1,1330 @@
+锘縶
+ "Version":"6.8.2.5",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":105000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "Size":256,
+ "Width":7,
+ "Height":55,
+ "LeftMargin":0,
+ "TopMargin":0,
+ "RightMargin":0,
+ "BottomMargin":0
+ },
+ "DetailGrid":{
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鐧惧垎姣斾竴"
+ },
+ {
+ "Name":"鐧惧垎姣斾簩"
+ },
+ {
+ "Name":"鐧惧垎姣斾笁"
+ },
+ {
+ "Name":"SIZE1"
+ },
+ {
+ "Name":"SIZE2"
+ },
+ {
+ "Name":"LBS"
+ },
+ {
+ "Name":"OZ"
+ },
+ {
+ "Name":"鏃ユ湡"
+ },
+ {
+ "Name":"瑙勬牸"
+ },
+ {
+ "Name":"UPC"
+ }
+ ]
+ },
+ "ColumnContent":{
+ "Height":0
+ },
+ "ColumnTitle":{
+ "Height":0
+ }
+ },
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Height":55.0069,
+ "Font":{
+ "Name":"Arial",
+ "Size":105000,
+ "Weight":400
+ },
+ "Control":[
+ {
+ "Type":"Line",
+ "Name":"Line1",
+ "Left":0.211667,
+ "Top":0.211667,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Left":1.00542,
+ "Top":0.396875,
+ "Width":5.00063,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"UNDER PENALTY OF LAW"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":1.21708,
+ "Top":0.978958,
+ "Width":4.65667,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"THIS TAG NOT TO BE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox3",
+ "Left":0.820208,
+ "Top":1.56104,
+ "Width":6.19125,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"REMOVED EXCEPT BY THE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":2.2225,
+ "Top":2.14313,
+ "Width":2.61938,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"CONSUMER"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line2",
+ "Left":0.211667,
+ "Top":2.80458,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Left":1.42875,
+ "Top":2.98979,
+ "Width":4.65667,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"ALL NEW MATERIAL"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox6",
+ "Left":2.19604,
+ "Top":3.57188,
+ "Width":3.01625,
+ "Height":0.582083,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"consisting of"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox7",
+ "Left":0.608542,
+ "Top":4.15396,
+ "Width":4.78896,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"POLYURETHANE FOAM"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Left":0.608542,
+ "Top":4.73604,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"PAD鈥︹�︹�︹�︹�︹�︹�︹�︹�︹��. [#鐧惧垎姣斾竴#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox8",
+ "Left":0.608542,
+ "Top":5.31813,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"BLENDED FIBER BATTING"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox2",
+ "Left":0.608542,
+ "Top":5.90021,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"鈥︹�︹�︹�︹�︹�︹�︹�︹�︹�︹�︹��.. [#鐧惧垎姣斾簩#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox9",
+ "Left":0.211667,
+ "Top":6.48229,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"(POLYESTER FIBER BATTING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox10",
+ "Left":0.608542,
+ "Top":7.06438,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"100%)"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line3",
+ "Left":0.211667,
+ "Top":7.80521,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox11",
+ "Left":1.00542,
+ "Top":7.99042,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Text":"Certification is made by the"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox12",
+ "Left":0.396875,
+ "Top":8.5725,
+ "Width":5.79438,
+ "Height":0.5821,
+ "Text":"manufacturer that the materials in"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox13",
+ "Left":0.79375,
+ "Top":9.15458,
+ "Width":5.79438,
+ "Height":0.5821,
+ "Text":"this article are described in"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox14",
+ "Left":1.40229,
+ "Top":9.73667,
+ "Width":3.99521,
+ "Height":0.5821,
+ "Text":"accordance with law"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line4",
+ "Left":0.211667,
+ "Top":10.3981,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox15",
+ "Left":2.40771,
+ "Top":10.6098,
+ "Width":2.77813,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"MADE FOR"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox16",
+ "Left":2.01083,
+ "Top":11.1919,
+ "Width":3.99521,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Symphony Sleep"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox17",
+ "Left":1.34938,
+ "Top":11.774,
+ "Width":5.00063,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"150 St Peters Centre Blvd."
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox18",
+ "Left":2.98979,
+ "Top":12.356,
+ "Width":1.5875,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Suite C"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox19",
+ "Left":1.82563,
+ "Top":12.9381,
+ "Width":4.20688,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"St Peters, MO 63376"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line5",
+ "Left":0.211667,
+ "Top":13.7583,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox20",
+ "Left":0.608542,
+ "Top":13.9965,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Date of Delivery:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox21",
+ "Left":0.608542,
+ "Top":14.5785,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Finished Size :"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox22",
+ "Left":0.608542,
+ "Top":15.1606,
+ "Width":5.58271,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"Net Weight of Filling Materials"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox3",
+ "Left":3.59833,
+ "Top":14.605,
+ "Width":3.59833,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"[#SIZE1#]X[#SIZE2#] In."
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox4",
+ "Left":0.608542,
+ "Top":15.7427,
+ "Width":5.97958,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Weight":400
+ },
+ "Text":"[#LBS#] lbs.[#OZ#] oz"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox23",
+ "Left":0.608542,
+ "Top":22.4102,
+ "Width":2.59292,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Date of Delivery:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox5",
+ "Left":3.99521,
+ "Top":22.4102,
+ "Width":1.79917,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"[#鏃ユ湡#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox24",
+ "Left":0.608542,
+ "Top":22.7806,
+ "Width":4.60375,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Importer/US Records Location:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox25",
+ "Left":0.608542,
+ "Top":23.151,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"Innovative Sleep Technologies"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox26",
+ "Left":0.608542,
+ "Top":23.5744,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Calibri",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"150 St. Peters Centre Blvd. - Suite C"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox27",
+ "Left":0.608542,
+ "Top":23.9977,
+ "Width":5.00063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Calibri",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"St. Peters, MO 63376"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox28",
+ "Left":0.608542,
+ "Top":24.7915,
+ "Width":1.19063,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Model:"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox6",
+ "Left":3.99521,
+ "Top":24.7915,
+ "Width":1.79917,
+ "Height":0.3969,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"[#瑙勬牸#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox29",
+ "Left":0.608542,
+ "Top":25.4,
+ "Width":1.40229,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Prototype ID: "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox30",
+ "Left":3.99521,
+ "Top":25.4,
+ "Width":1.79917,
+ "Height":0.396875,
+ "Font":{
+ "Name":"Arial",
+ "Size":60000,
+ "Weight":400
+ },
+ "Text":"Multiple"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox31",
+ "Left":0.608542,
+ "Top":26.4054,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Bold":true
+ },
+ "Text":"FOUNDATION ID: "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox32",
+ "Left":3.59833,
+ "Top":26.4054,
+ "Width":2.98979,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Bold":true,
+ "Underline":true
+ },
+ "Text":"SSABWM-22"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line6",
+ "Left":0.211667,
+ "Top":27.596,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox33",
+ "Left":0.608542,
+ "Top":28.0723,
+ "Width":1.79917,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Weight":400
+ },
+ "Text":"Serial No."
+ },
+ {
+ "Type":"Line",
+ "Name":"Line7",
+ "Left":0.211667,
+ "Top":28.9983,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox7",
+ "Left":3.20146,
+ "Top":28.0723,
+ "Width":3.59833,
+ "Height":0.5821,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox34",
+ "Left":1.79917,
+ "Top":29.3952,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Not to be removed until"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox35",
+ "Left":1.79917,
+ "Top":29.7921,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"delivered to the consumer"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox36",
+ "Left":1.79917,
+ "Top":30.6123,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Ne pas enleveravant la"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox37",
+ "Left":1.5875,
+ "Top":31.0621,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"livraison au consommateur"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line8",
+ "Left":0.211667,
+ "Top":31.8029,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox38",
+ "Left":2.01083,
+ "Top":32.1998,
+ "Width":3.20146,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"This article contains"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox39",
+ "Left":2.01083,
+ "Top":32.5967,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"NEW MATERIAL"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox40",
+ "Left":3.01625,
+ "Top":32.9935,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"ONLY"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox41",
+ "Left":2.01083,
+ "Top":33.999,
+ "Width":4.02167,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Cet article contient des"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox42",
+ "Left":0.396875,
+ "Top":34.3958,
+ "Width":7.19667,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":112500,
+ "Bold":true
+ },
+ "Text":"MAT脡RIAUX NEUFS SEULEMENT"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line9",
+ "Left":0.211667,
+ "Top":35.1896,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox43",
+ "Left":1.19063,
+ "Top":35.4013,
+ "Width":5.21229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"This label is affixed in compliance"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox44",
+ "Left":2.19604,
+ "Top":35.8246,
+ "Width":3.20146,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"with Provincial Law"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox45",
+ "Left":1.5875,
+ "Top":36.8035,
+ "Width":4.78896,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Cette etiquette est appos茅e"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox46",
+ "Left":0.820208,
+ "Top":37.2269,
+ "Width":5.58271,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"conform茅ment 脿 la loi de la province"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line10",
+ "Left":0.211667,
+ "Top":37.9942,
+ "Width":6.58813,
+ "Pen":{
+ "Width":2
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox47",
+ "Left":0.396875,
+ "Top":38.2058,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Reg. No."
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox48",
+ "Left":4.20688,
+ "Top":38.2058,
+ "Width":2.38125,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"No de permis聽:"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox49",
+ "Left":2.19604,
+ "Top":38.7879,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"01T-02479117"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox50",
+ "Left":2.40771,
+ "Top":39.2113,
+ "Width":1.98438,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"QC-013022"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox51",
+ "Left":2.80458,
+ "Top":39.6346,
+ "Width":1.19063,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"66768"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox52",
+ "Left":0.396875,
+ "Top":40.5871,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Content"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox53",
+ "Left":3.59833,
+ "Top":40.5871,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":90000,
+ "Weight":400
+ },
+ "Text":"Contenu"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox54",
+ "Left":0.211667,
+ "Top":41.1956,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"PADDING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox55",
+ "Left":3.20146,
+ "Top":41.1956,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"REMBOURRAGE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox56",
+ "Left":0.211667,
+ "Top":41.9894,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"POLYETHYLENE "
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox57",
+ "Left":0.211667,
+ "Top":42.545,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"FOAM PAD"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox58",
+ "Left":3.12208,
+ "Top":42.0158,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"Mousse de"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox59",
+ "Left":3.12208,
+ "Top":42.5715,
+ "Width":2.40771,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Bold":true
+ },
+ "Text":"Poly茅phyl猫ne"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line11",
+ "Left":0.211667,
+ "Top":43.2065,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox60",
+ "Left":0.608542,
+ "Top":43.3917,
+ "Width":6.19125,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"Federal Requirement/Exigence f茅d茅rale"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox61",
+ "Left":2.40771,
+ "Top":44.3971,
+ "Width":2.19604,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":82500,
+ "Bold":true
+ },
+ "Text":"SOR/2016-194"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox62",
+ "Left":0.396875,
+ "Top":44.794,
+ "Width":6.58813,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":75000,
+ "Bold":true
+ },
+ "Text":"POLYETHYLENE FABRIC TISSU MULTICOUCHES"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox63",
+ "Left":1.50813,
+ "Top":45.4025,
+ "Width":0.820208,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"FACE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox64",
+ "Left":4.78896,
+ "Top":45.4025,
+ "Width":0.820208,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"VISAGE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox65",
+ "Left":0.608542,
+ "Top":46.011,
+ "Width":1.5875,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYESTER"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox66",
+ "Left":3.81,
+ "Top":46.011,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Polyester"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox8",
+ "Left":5.79438,
+ "Top":46.011,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox67",
+ "Left":0.608542,
+ "Top":46.7783,
+ "Width":2.19604,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYURETHANE"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox68",
+ "Left":3.41313,
+ "Top":46.7783,
+ "Width":1.79917,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Poly茅phyl猫ne"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox9",
+ "Left":5.79438,
+ "Top":46.7783,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox69",
+ "Left":1.19063,
+ "Top":47.8367,
+ "Width":2.2225,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"FR BACKING"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox70",
+ "Left":4.39208,
+ "Top":47.8367,
+ "Width":2.01083,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":" FR SUPPORT"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox71",
+ "Left":0.608542,
+ "Top":48.4452,
+ "Width":1.5875,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"POLYESTER"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox72",
+ "Left":3.81,
+ "Top":48.4452,
+ "Width":1.40229,
+ "Height":0.449792,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"Polyester"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox10",
+ "Left":5.79438,
+ "Top":48.4452,
+ "Width":1.40229,
+ "Height":0.4498,
+ "Font":{
+ "Name":"Arial",
+ "Size":67500,
+ "Weight":400
+ },
+ "Text":"[#UPC#]"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line12",
+ "Left":0.211667,
+ "Top":49.7946,
+ "Width":6.58813,
+ "Pen":{
+ "Width":5
+ }
+ },
+ {
+ "Type":"Line",
+ "Name":"Line13",
+ "Left":5.3975,
+ "Top":50.8,
+ "Width":1.40229,
+ "Pen":{
+ "Width":2
+ }
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
index 95de7ab..0039094 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatus.html"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/HideButton_New.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -26,36 +27,44 @@
<div class="layui-inline">
<label class="layui-form-label">浠ｇ爜</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width:85px;">浣跨敤鐘舵��</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
- <select name="HUseFlag" id="HUseFlag" lay-filter="HUseFlag">
- <option value="鏈娴�">鏈娴�</option>
- <option value="鏈娇鐢�" selected>鏈娇鐢�</option>
- <option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 300px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
</div>
-
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <select class="ForFilteringSchemes" name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select class="ForFilteringSchemes" name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
@@ -70,7 +79,65 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select class="ForFilteringSchemes" name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select class="ForFilteringSchemes" name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:10px;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select class="ForFilteringSchemes" name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select class="ForFilteringSchemes" name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
</div>
</div>
</div>
@@ -79,13 +146,22 @@
</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-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></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 class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layuiiconlayuiiconform"></i>澶嶅埗</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layuiiconform"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Close" id="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -117,11 +193,30 @@
var option = [];
var Organization = sessionStorage["Organization"];
var HModName = "Gy_MouldStatus";
+ var set_HideButton_ID = "toolbarDemo_ButtonSet"; //闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
+ var HBillType = "Gy_MouldStatus";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID"];
+
+ var ins; //璁板綍瀵煎嚭鍐呭
//#endregion
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "鍣ㄥ叿鐘舵�佺淮鎶�";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+
//#region 杩涘叆椤甸潰鍗冲姞杞�
+
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -137,14 +232,35 @@
case 'btn-Add':
set_AddNew();
break;
+ //缂栬緫鎸夐挳
case 'btn-Edit':
set_ShowBill();
+ break;
+ //澶嶅埗鎸夐挳
+ case 'btn-Copy':
+ set_CopyBill();
break;
case 'btn-Delete':
set_DeleteBill();
break;
//鍒锋柊
case 'get_Refresh': get_Refresh();
+ break;
+ //瀹℃牳鎸夐挳
+ case 'btn-Audit':
+ set_CheckBill(0);
+ break;
+ //鍙嶅鏍告寜閽�
+ case 'btn-DeAudit':
+ set_CheckBill(1);
+ break;
+ //绂佺敤鎸夐挳
+ case 'btn-Stop':
+ set_De_Stop(0);
+ break;
+ //鍙嶇鐢ㄦ寜閽�
+ case 'btn-DeStop':
+ set_De_Stop(1);
break;
//閫�鍑烘寜閽�
case 'btn-Close':
@@ -153,6 +269,20 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
break;
};
});
@@ -200,10 +330,16 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Organ();
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ //get_Display(sWhere);
+ get_FastQuery();
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
//#endregion
@@ -224,10 +360,16 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HNumber").val("");
- $("#HUseFlag").val("鏈娇鐢�");
+ $("#HName").val("");
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
}
@@ -239,6 +381,7 @@
var ajaxLoad = layer.load();
$.ajax({
url: GetWEBURL() + '/Gy_MouldStatus/Gy_MouldStatusList',
+ async:false,
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
success: function (data1) {
@@ -285,14 +428,20 @@
, limits: [50, 500, 5000, 50000]
, limit: 50
, cellMinWidth: 90
+ , done: function (res, curr, count) {
+ //soulTable.render(this);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
+ }
}
- table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.close(ajaxLoad);
- if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
ColFilter();
}
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
@@ -311,10 +460,17 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
var HNumber = $("#HNumber").val();
- var HUseFlag = $("#HUseFlag").val();
+ var HName = $("#HName").val();
+ var HUSEORGID = $("#HUSEORGID").val();
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
if (ColName != 0 && Comparator != 0) {
var com = "";
switch (Comparator) {
@@ -336,11 +492,58 @@
}
sWhere += " and " + ColName + " " + com;
}
+
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (HNumber) {
sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
}
- if (HUseFlag) {
- sWhere += " and 浣跨敤鐘舵�� like '%" + HUseFlag + "%'";
+ if (HName) {
+ sWhere += " and 鍚嶇О like '%" + HName + "%'";
+ }
+
+ if (HUSEORGID != "0") {
+ sWhere += " and HUSEORGID = " + HUSEORGID;
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -408,6 +611,100 @@
//#endregion
//#endregion
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MouldStatus/AuditGy_MouldStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 鍙嶇鐢�/绂佺敤鏁版嵁
+ function set_De_Stop(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HItemID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_MouldStatus/StopGy_MouldStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ //var ModRightNameCheck = "Gy_MouldStatus_ExportExcel";
+
+ ////閫昏緫瀹℃牳鏂规硶
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ // } else {
+ // layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ //});
+ }
+ //#endregion
+
//#region 鏂板
function set_AddNew() {
layer.open({
@@ -427,6 +724,37 @@
}
});
+ }
+ //#endregion
+
+ //#region 澶嶅埗鍗曟嵁
+ function set_CopyBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].HItemID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '澶嶅埗鍣ㄥ叿鐘舵��'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鍩虹璧勬枡/Gy_MouldStatusEdit.html?hID=' + hID + '&HOperationType=2'
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
}
//#endregion
@@ -588,6 +916,34 @@
}
//#endregion
+
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+
+ var HOrgIDBar = sessionStorage["OrganizationID"];
+
+ $("#HUSEORGID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
//#region 鍒楁槑鏄剧ず涓嬫媺妗�
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
@@ -598,11 +954,264 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+
form.render('select');
}
//#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#endregion
});
//#endregion
+
+
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatusEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatusEdit.html"
index b245004..747bdb5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatusEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldStatusEdit.html"
@@ -41,6 +41,7 @@
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="Check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Check">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -48,6 +49,7 @@
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<ul class="layui-tab-title">
<li class="layui-this">鍩烘湰淇℃伅</li>
+ <li class="">鍒跺崟淇℃伅</li>
</ul>
<h1 style="text-align:center;"><b>鍣ㄥ叿鐘舵��</b></h1>
<div class="layui-tab-content">
@@ -88,7 +90,68 @@
<div class="layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織锛�</label>
<div class="layui-input-inline">
- <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+ <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤" disabled>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
+ </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="HModifyEmp" id="HModifyEmp" style="background-color:#efefef4d;" readonly>
+ </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="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HMakeDate" id="HMakeTime" style="background-color:#efefef4d;" readonly>
+ </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="HModifyDate" id="HModifyTime" style="background-color:#efefef4d;" readonly>
+ </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="HCheckDate" id="HCheckTime" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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="HStopDate" id="HStopTime" style="background-color:#efefef4d;" readonly>
</div>
</div>
</div>
@@ -128,10 +191,19 @@
var params = getUrlVars();
//var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HOperationType = params[params[1]];
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
-
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ }
+ else if (HOperationType == 2) {
+ //绂佺敤缁勭粐閫夐」
+ RoadBillMain(linterid);
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
+ $("#HItemID").val("0");
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
//绂佺敤缁勭粐閫夐」
@@ -149,6 +221,16 @@
form.on('submit(Saver)', function (data) {//鎻愪氦
set_AddNew(data);
});
+
+ //瀹℃牳
+ form.on('submit(Check)', function () {
+ set_CheckBill(1);
+ })
+
+ //鍙嶅鏍�
+ form.on('submit(deCheck)', function () {
+ set_CheckBill(2);
+ })
//閫�鍑�
form.on('submit(Exit)', function (data) {
@@ -223,7 +305,7 @@
{
var sWhere = " and HItemID='" + linterid + "'";
$.ajax({
- url: GetWEBURL() + "/Gy_MouldStatus/Gy_MouldStatusList",
+ url: GetWEBURL() + "/Gy_MouldStatus/Gy_MouldStatusEditInit",
type: "GET",
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]},
@@ -241,6 +323,15 @@
, "HUSEORGID": d.data[0].HUSEORGID
, "HStopflag": d.data[0].绂佺敤鏍囧織
, "HRemark": d.data[0].澶囨敞
+ , "HMakeEmp": d.data[0].鍒涘缓浜�
+ , "HMakeDate": d.data[0].鍒涘缓鏃ユ湡
+ , "HModifyEmp": d.data[0].淇敼浜�
+ , "HModifyDate": d.data[0].淇敼鏃ユ湡
+ , "HCheckEmp": d.data[0].瀹℃牳浜�
+ , "HCheckDate": d.data[0].瀹℃牳鏃ユ湡
+ , "HStopEmp": d.data[0].绂佺敤浜�
+ , "HStopDate": d.data[0].绂佺敤鏃ユ湡
+
});
form.render('checkbox');
form.render('select');
@@ -248,6 +339,88 @@
})
}
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ function set_CheckBill(num) {
+ var HItemID = $("#HItemID").val();
+ if (HItemID == 0) {
+ //閫昏緫瀹℃牳鏂规硶
+ var sql = "select * from Gy_MouldStatus where HNumber = '" + $("#HNumber").val() + "' and HUSEORGID = " + $("#HUSEORGID").val() + " and convert(varchar(100),HMakeTime,23) = convert(varchar(100),getdate(),23)";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length == 1) {
+ HItemID = data1.data[0].HItemID;
+ }
+ else {
+ layer.alert("瀹℃牳鏁版嵁涓嶅瓨鍦紝璇锋娴嬫槸鍚﹀凡缁忎繚瀛橈紒", { icon: 5 });
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ //閫昏緫瀹℃牳鏂规硶
+ var sql = "select * from Gy_MouldType where HNumber = '" + $("#HNumber").val() + "' and HUSEORGID = " + $("#HUSEORGID").val() + " and convert(varchar(100),HMakeTime,23) = convert(varchar(100),getdate(),23)";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ if (data1.data.length > 0) {
+ HItemID = data1.data[0].HItemID;
+ } else {
+ layer.alert("瀹℃牳鏁版嵁涓嶅瓨鍦紝璇锋娴嬫槸鍚﹀凡缁忎繚瀛橈紒", { icon: 5 });
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ if (HItemID == "0") {
+ return;
+ }
+
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ async: false,
+ url: GetWEBURL() + "/Gy_MouldStatus/AuditGy_MouldStatus", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HItemID, "Type": num, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
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 fb7672f..10d43b1 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"
@@ -198,6 +198,14 @@
</div>
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ュ簭鍒嗙被</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HProcType" id="HProcType" autocomplete="off">
+ </div>
+ </div>
+ </div>
<div class="layui-tab-item">
<div class="layui-col-xs4 layui-inline">
@@ -826,6 +834,7 @@
, "HCheckEmp": data.瀹℃牳浜�
, "HCheckTime": data.瀹℃牳鏃ユ湡 == null ? "" : Format(new Date(data.瀹℃牳鏃ユ湡), "yyyy-MM-dd")
, "HStandardWages": data.鏍囧噯宸ヤ环
+ , "HProcType": data.宸ュ簭鍒嗙被
});
layer.close(ajaxLoad);
} else {
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/Gy_Process_Excel.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/Gy_Process_Excel.html"
index 4a48f30..eb850e0 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/Gy_Process_Excel.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/Gy_Process_Excel.html"
@@ -88,8 +88,17 @@
url: GetWEBURL() + '/Gy_Process/Gy_Process_Excel',
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
+ before: function (obj) {
+ layer.load();
+ },
done: function (data1) {
+ layer.closeAll('loading');
if (data1.count == 1) {
+ if (data1.Message != "") {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ return;
+ }
+
option.data = data1.data;
table.render(option);
} else {
@@ -153,6 +162,7 @@
, { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О', width: 120 }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 120 }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 120 }
+ , { field: '宸ュ簭鍒嗙被', title: '宸ュ簭鍒嗙被', width: 120 }
, { field: 'HDeptID', title: 'HDeptID', width: 120, hide: true }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 120 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 120 }
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 92245cd..686a869 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -1494,7 +1494,7 @@
var addSWhere = "";
if (openType != undefined && HOrgName != "undefined") {
- addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� !='' ";
+ addSWhere = " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� <> '' ";
Organization = HOrgName.toString();
}
return addSWhere;
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
index 7f51061..ab6ad99 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFile.html"
@@ -397,7 +397,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -407,7 +407,7 @@
<div class="layui-input-block" style="margin-left: 77px;">
<input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
<input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
@@ -415,7 +415,7 @@
<div class="layui-inline" style="margin-left:10px;">
<label class="layui-form-label">鍣ㄥ叿鍙敤鐘舵��</label>
<div class="layui-input-block">
- <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
+ <select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus" disabled>
<option value="姝ｅ父" selected="selected">姝ｅ父</option>
<option value="寮傚父">寮傚父</option>
<option value="淇濆吇">淇濆吇</option>
@@ -583,6 +583,8 @@
</script>
<script>
var Stverf = "";
+
+ var HDataEmp = {};
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -639,6 +641,7 @@
//鍒濆鍖栧瓙琛�
get_InitGrid();
set_AddFNew();
+ $("#HUSEORGID").attr("disabled", true);
} else if (OperationType == 2) {//鏃犳簮鍗�
Stverf = "Add";
get_InitGrid();
@@ -654,15 +657,20 @@
$("#HCloseDate").val("");
$("#HDeleteMan").val("");
$("#HDeleteDate").val("");
+ $("#HMouldNo").val("");
+ $("#HBarCode").val("");
+ $("#HUSEORGID").attr("disabled", true);
}
else if (OperationType == 3) {//缂栬緫
Stverf = "Update";
//鍒濆鍖栧瓙琛�
get_InitGrid();
set_EditFromGrid();
+ $("#HUSEORGID").attr("disabled", true);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ $("#HUSEORGID").attr("disabled", true);
}
//#endregion
@@ -692,6 +700,7 @@
//瀵瑰簲Erp鐗╂枡
form.on('submit(btnHMaterList)', function () {
+ var HOrgID = $("#HUSEORGID").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -701,7 +710,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID , 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -730,6 +739,7 @@
//妯″叿鍒嗙被
form.on('submit(btnHMouleList)', function () {
+ var HOrgID = $("#HUSEORGID").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -739,7 +749,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html?openType=2&HOrgID=' + HOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -776,7 +786,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -804,6 +814,8 @@
//閮ㄩ棬
form.on('submit(btnHDeptList)', function () {
+ var HOrgName = sessionStorage["Organization"];
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -813,7 +825,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + HOrgName, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -841,6 +853,8 @@
//渚涘簲鍟�
form.on('submit(btnHSupList)', function () {
+ var HOrgName = sessionStorage["Organization"];
+
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -850,7 +864,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes'],
+ content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -878,6 +892,7 @@
//鍒堕�犲巶鍟�
form.on('submit(btnHMadeSup)', function () {
+ var HOrgName = sessionStorage["Organization"];
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -887,7 +902,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup', 'yes'],
+ content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup&HOrgName=' + HOrgName, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -924,7 +939,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1109,7 +1124,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace_List.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1182,7 +1197,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['Sc_MouldMaintainRuleBillList.html', 'yes'],
+ content: ['Sc_MouldMaintainRuleBillList.html?openType=2', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1393,7 +1408,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy- MM - dd"), "HRemark": "",
+ "HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy-MM-dd"), "HRemark": "",
"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
};
switch (obj.event) {
@@ -1615,7 +1630,7 @@
{
"HMouldFileID": "0"
, "HMouldFileName": ""
- , "HUnionDate": Format(new Date, "yyyy- MM - dd")
+ , "HUnionDate": Format(new Date, "yyyy-MM-dd")
, "HRemark": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
@@ -1713,6 +1728,7 @@
$("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
$.ajax({
url: GetWEBURL() + "/Gy_Mould_Edit/xg",
+ async:false,
type: "GET",
data: {
"HInterID": linterid
@@ -1995,7 +2011,7 @@
data: { "oMain": oMain },
dataType: "json",
success: function (data) {
- if (data.count == 1) {
+ if (data.code == 1) {
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
if (linterid == undefined) {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
@@ -2043,34 +2059,42 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html", "yes"]
+ , content: ["../../妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_MouldFileList.html?openType=2", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ var rowIndex = $(obj.tr).attr("data-index") * 1;
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ if (rowIndex + i >= option.data.length) {
+ var NewRow = {
+ "HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy-MM-dd"), "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
+ };
+ btnAddLine(NewRow);
+ }
+
+ //鑾峰彇閫変腑鐨勫瓙鍣ㄥ叿淇℃伅
+ var resultData = checkStatus.data[i];
+ option.data[rowIndex + i].HMouldFileID = resultData.hmainid;
+ option.data[rowIndex + i].HMouldFileName = resultData.妯″叿鍚嶇О;
}
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HMouldFileID": checkStatus.data[0].hmainid,
- "HMouldFileName": checkStatus.data[0].妯″叿鍚嶇О
- })
+
+ table.render(option);
+
layer.close(index);//鍏抽棴寮圭獥
}
, btn2: function (index, layero) { }
, end: function () {
- if (typeof (OptionData.HItemID) != "undefined") {
+ if (typeof (HDataEmp.hmainid) != "undefined") {
obj.update({
- "HMouldFileID": OptionData.HItemID,
- "HMouldFileName": OptionData.妯″叿鍚嶇О
+ "HMouldFileID": HDataEmp.hmainid,
+ "HMouldFileName": HDataEmp.妯″叿鍚嶇О
})
- OptionData = [];
+ HDataEmp = {};
}
-
-
}
})
}
@@ -2188,6 +2212,14 @@
}
//#endregion
+ //#region 鍦ㄦ湯灏惧鍔犱竴琛�
+ function btnAddLine(NewRow) {
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ }
+ //#endregion
+
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//if (sessionStorage.login != "login") {
// layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -2296,14 +2328,14 @@
return Result;
}
- function GetMaterValue(obj) { //鐗╂枡
- $("#HName").val(obj[0].鐗╂枡鍚嶇О);
- $("#HMaterNumber").val(obj[0].鐗╂枡浠ｇ爜);
- $("#HMaterID").val(obj[0].HItemID);
+ function GetGyMaterial(obj) { //鐗╂枡
+ $("#HName").val(obj.鐗╂枡鍚嶇О);
+ $("#HMaterNumber").val(obj.鐗╂枡浠ｇ爜);
+ $("#HMaterID").val(obj.HItemID);
}
function GetMouldTypeValue(obj) { //鍣ㄥ叿鍒嗙被
- $("#HMouleTypeName").val(obj[0].HName);
+ $("#HMouleTypeName").val(obj[0].鍣ㄥ叿鍒嗙被鍚嶇О);
$("#HMouleTypeID").val(obj[0].HItemID);
}
@@ -2328,8 +2360,8 @@
}
function GetGyStockPlace(obj) { //浠撲綅
- $("#HSPName").val(obj[0].浠撲綅鍚嶇О);
- $("#HSPID").val(obj[0].HMainID);
+ $("#HSPName").val(obj.浠撲綅鍚嶇О);
+ $("#HSPID").val(obj.HMainID);
}
function GetMouldMaintainRuleValue(obj) { //淇濆吇瑙勭▼
@@ -2345,6 +2377,8 @@
//瀛愯〃鍣ㄥ叿鍙屽嚮杩斿洖
function GetMouldFileValue(obj) {
OptionData = obj[0];
+
+ HDataEmp = obj[0];
}
function GetMouldDotCheckRuleValue(obj) {
OptionData = obj[0];
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
index 0c5ba99..a2adb76 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_MouldFileList.html"
@@ -49,6 +49,14 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 300px;">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -231,6 +239,33 @@
set_ClearBill();
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '妯″叿缂栧彿') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid;
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鍣ㄥ叿妗ｆ鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: 'Gy_MouldFile.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
//#region 椤甸潰鎸夐挳鐐规浜嬩欢瑙﹀彂
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -350,6 +385,8 @@
//鍒濆鍖栬〃鏍�
function set_ClearBill() {
+ Organ();
+
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍒濆鍖栭〉澶у皬
@@ -391,7 +428,10 @@
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true }
, { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true }
- , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true }
+ , {
+ field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, event: '妯″叿缂栧彿', templet: function (d) {
+ return '<span style="color: blue;">' + d.妯″叿缂栧彿 + '</span>'
+ }, style: 'cursor: pointer;' }
, { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true }
, { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
, { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
@@ -627,6 +667,10 @@
if (HName) {
sWhere += " and 妯″叿鍚嶇О like '%" + HName + "%'";
}
+ if (HUSEORGID && HUSEORGID != "0") {
+ sWhere += " and HUSEORGID = " + HUSEORGID + "";
+ }
+
if (sql != "") {
sWhere += sql;
}
@@ -1124,6 +1168,33 @@
}
}
+ //#region 鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+
+ var HOrgIDBar = sessionStorage["OrganizationID"];
+
+ $("#HUSEORGID").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
//#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -1144,7 +1215,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof(openType) != "undefined") {
- addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+ addSWhere = " and 浣滃簾浜� = '' and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
index c5d855c..fe6ab9b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillList.html"
@@ -1188,7 +1188,7 @@
var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var addSWhere = "";
if (typeof (openType) != "undefined") {
- addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� != ''";
+ addSWhere = " and 鍏抽棴浜� = '' and 瀹℃牳浜� <> ''";
}
return addSWhere;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index 5a6b55c..f4432b5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -1676,7 +1676,7 @@
columns.push({ field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 150, filter: true, sort: true});
columns.push({ field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
columns.push({ field: '瀹㈡埛璁㈠崟鍙�', title: '瀹㈡埛璁㈠崟鍙�', width: 150, style: 'background-color: #f9f9f9;', filter: true, sort: true });
- columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, filter: true, sort: true });
+ columns.push({ field: '鐢熶骇缁勭粐', title: '鐢熶骇缁勭粐', width: 150, sort: true });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', width: 150, filter: true, sort: true});
columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150, filter: true, sort: true});
columns.push({ field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 150, filter: true, sort: true });
@@ -1688,7 +1688,7 @@
columns.push({ field: '鐢熶骇璁㈠崟鏃ユ湡', title: '鐢熶骇璁㈠崟鏃ユ湡', width: 150, templet: "<div>{{d.鐢熶骇璁㈠崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鐢熶骇璁㈠崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", filter: true, sort: true });
columns.push({ field: '璁″垝缁撴潫鏃ユ湡', title: '璁″垝缁撴潫鏃ユ湡', width: 150, templet: "<div>{{d.璁″垝缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.璁″垝缁撴潫鏃ユ湡, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", filter: true, sort: true });
- columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, filter: true, sort: true});
+ columns.push({ field: '璁㈠崟鍙帓鏁伴噺', title: '璁㈠崟鍙帓鏁伴噺', width: 150, sort: true});
columns.push({ field: '鎷嗗崟鏁伴噺', title: '鎷嗗崟鏁伴噺', width: 150, edit: 'text', filter: true, sort: true });
columns.push({ field: '鏄ㄦ棩鏁伴噺', title: '鏄ㄦ棩鏁伴噺', filter: true, sort: true });
columns.push({ field: '浼樺厛绾�', title: '浼樺厛绾�', width: 150, edit: 'text', filter: true, sort: true });
@@ -1715,7 +1715,7 @@
columns.push({ field: '鐢熶骇鍛ㄦ湡', title: '鐢熶骇鍛ㄦ湡', width: 150 });
columns.push({ field: '鏈�杩熷紑宸ユ棩鏈�', title: '鏈�杩熷紑宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷紑宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷紑宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
columns.push({ field: '鏈�杩熷畬宸ユ棩鏈�', title: '鏈�杩熷畬宸ユ棩鏈�', width: 150, templet: "<div>{{d.鏈�杩熷畬宸ユ棩鏈� =='' ?'':layui.util.toDateString(d.鏈�杩熷畬宸ユ棩鏈�, 'yyyy-MM-dd')}}</div>" });
- columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, filter: true, sort: true });
+ columns.push({ field: '閿�鍞鍗曟暟閲�', title: '閿�鍞鍗曟暟閲�', width: 150, sort: true });
columns.push({ field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿', width: 150 });
columns.push({ field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 150 });
columns.push({ field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 150 });
@@ -1865,7 +1865,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillList',
type: "GET",
- async: false,
+ async: true,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
new file mode 100644
index 0000000..f847926
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagBarCodeList.html"
@@ -0,0 +1,1191 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>瀹㈡埛鏍囩鏉＄爜鍒楄〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+ <script src="../../../layuiadmin/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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璁㈠崟鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HICMOBillNo" id="HICMOBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCustName" id="HCustName" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ <div class="layui-colla-content">
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="page" style="margin-top:30px;"></div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>璇诲彇鏂规</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+
+ var Organization = sessionStorage["Organization"];
+
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+
+ var HModName = "Sc_CustomerTagBarCodeList";
+ var HBillType = "10003";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //杩囨护鏉′欢鐨刢lass绫�
+ var HClassTag = "ForFilteringSchemes";
+ //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
+ window.HModuleName = "瀹㈡埛鏍囩鏉＄爜缁存姢";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗堬紙鍏ㄥ眬鍙橀噺锛�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮侊紙鍏ㄥ眬鍙橀噺锛�
+ window.HInterID_Choose = 0;
+
+ //#endregion
+
+
+ //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
+ var HModuleType = "10003";
+ //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
+ var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+ //#endregion
+ var titleData = ["HItemID","hmainid", "HCustID", "hsubid", "HMaterID","sorderid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //閲嶆柊鍚屾鎸夐挳
+ form.on('submit(btnResCnz)', function (data) {
+ set_ResCnz();
+ });
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+ //#endregion 杈撳叆妗嗗洖杞︾洃鍚�
+ $('input[type="text"]').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ $("#btnSearch").click();
+ }
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ optionPage.curr = 1;
+ get_FastQuery(table, option);
+
+ });
+ //#endregion
+
+ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+ form.on('select(HInitTimeCycle)', function (data) {
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ });
+
+ //鑾峰彇缁勭粐
+ Organ();
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ setSelect_HInitTimeCycle();
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //鏌ヨ
+ get_FastQuery(table, option);
+ DisPlay_HideColumn();
+ //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
+ ColFilter();
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
+ }
+ //#endregion
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ //, page: true
+ , cellMinWidth: 90
+ , limit: 50
+ //, limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ , cols: []
+ };
+
+ optionPage = {
+ elem: 'page', //娉ㄦ剰锛岃繖閲岀殑 page 鏄� ID锛屼笉鐢ㄥ姞 # 鍙�
+ count: 10000, //鏁版嵁鎬绘暟锛屼粠鏈嶅姟绔緱鍒�
+ limit: 50,
+ limits: [50, 500, 5000, 50000],
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ jump: function (obj, first) {
+ //console.log(obj)
+ //obj鍖呭惈浜嗗綋鍓嶅垎椤电殑鎵�鏈夊弬鏁帮紝姣斿锛�
+ //console.log(obj.curr); //寰楀埌褰撳墠椤碉紝浠ヤ究鍚戞湇鍔＄璇锋眰瀵瑰簲椤电殑鏁版嵁銆�
+ //console.log(obj.limit); //寰楀埌姣忛〉鏄剧ず鐨勬潯鏁�
+
+ //棣栨涓嶆墽琛�
+ if (!first) {
+ //do something
+ console.log(obj)
+ get_FastQuery(table, option);
+ }
+ }
+ }
+ laypage.render(optionPage);
+ }
+
+ //#endregion 鐩戝惉缃戞牸琛ㄤ綋浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+
+ //鍗曟嵁鍙疯秴閾炬帴
+ if (obj.event == '鍗曟嵁鍙�') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鍗曟嵁鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ var linterid = data.hmainid.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
+ type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
+ , area: ['100%', '100%']
+ , title: '缂栬緫' + HPageTitle //璁剧疆寮瑰嚭灞傜殑鍚嶅瓧鍜屽彉閲�
+ , closeBtn: 1//鏄剧ず鍏抽棴鎸夐挳
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/瀹㈡埛鏍囩/Sc_CustomerTagInfoEdit.html?OperationType=3&linterid='+ linterid + '&HSouceBillType=0&closeType=1' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
+ end: function () { //褰撳叧闂椂璋冪敤
+ get_FastQuery(table, option);
+ }
+ , cancel: function () { //鐐瑰嚮鍙栨秷鏃朵娇鐢ㄥ洖璋�
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+ //#endregion
+
+ //#region 鏌ヨ(涓昏〃)-鍒嗛〉
+ function get_DisplayPage(sWhere) {
+ var wait = layer.load();//閬僵
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_CustomerTagBarCode/BarPageList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
+ success: function (data1) {
+ option.limit = optionPage.limit;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+
+ laypage.render(optionPage);
+ layer.close(ajaxLoad);
+
+ DisPlay_HideColumn();
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+ ColFilter();
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
+ }
+ }, error: function (e) {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(wait);
+ }
+ //#endregion
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length >= 1) {
+ var HItemIDs = "";
+ for (i = 0; i < data.length; i++) {
+ HItemIDs += data[i].HItemID.toString() + ",";
+ }
+ HItemIDs = HItemIDs.substring(0, HItemIDs.length - 1)
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_CustomerTagBarCode/DeleteBarCode", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemIDs": HItemIDs, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨鏁版嵁鍒犻櫎锛�');
+ }
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ //闅愯棌鍒楄缃�
+ case 'HideColumn':
+ get_HideColumn();
+ break;
+ //鎸夐挳璁剧疆
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ break;
+ //淇濆瓨鏂规
+ case 'set_SaveScheme': set_SaveScheme();
+ break;
+ //璇诲彇鏂规
+ case 'set_ReadScheme': set_ReadScheme();
+ break;
+ //瀵煎嚭excel
+ case 'get_export': get_Export();
+ break;
+ };
+ });
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HCustName = $("#HCustName").val();//瀹㈡埛鍚嶇О
+ var HICMOBillNo = $("#HICMOBillNo").val();//鐢熶骇璁㈠崟鍙�
+
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+ if (ColName != 0 && Comparator != 0) {
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like'%" + ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + ColContent + "%'";
+ break;
+ default:
+ com = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator + "'" + ColContent + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HCustName) {
+ sWhere += " and 瀹㈡埛鍚嶇О like '%" + HCustName + "%'";
+ }
+ if (HICMOBillNo) {
+ sWhere += " and 鐢熶骇璁㈠崟鍙� like '%" + HICMOBillNo + "%'";
+ }
+
+ //sWhere += addSWhereByOpenType();
+ get_DisplayPage(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HMaterNumber").val("");//
+ $("#HICMOBillNo").val("");//
+ $("#HCustName").val("");//
+
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ form.render('select');
+
+ sWhere = "";
+ }
+ //#endregion
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+
+ form.render('select');
+ }
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_DisplayPage(sWhere);
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 鎺掑簭鍚庨�夋嫨
+ table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTable', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ option.data = layui.table.cache["mainTable"];
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ });
+ //#endregion
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length ; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒濆鍖栭〉澶у皬
+ DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
+ //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
+ get_FastQuery(table, option);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ async: false,
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HItemID","hmainid", "sorderid", "HCustID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID","HWHID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length -1; i++) {
+ if (dataCol.length <= i) {
+ break;
+ }
+
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ } else {
+ table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
+ //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+ function setSelect_HInitTimeCycle() {
+ var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
+ var titleList = ["浠婂ぉ", "杩戜袱澶�", "杩戜笁澶�", "杩戝洓澶�", "杩戜簲澶�", "杩戝叚澶�", "杩戜竷澶�", "杩�30澶�", "杩戝崐骞�", "杩戜竴骞�"];
+
+ var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >浠绘剰闂撮殧</option>';
+ for (var i = 0; i < valueList.length; i++) {
+ HInitTimeCycle_ArrayList += '<option style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
+ }
+
+ $("#HInitTimeCycle").empty();
+ $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
+ form.render('select');
+
+ $("#HInitTimeCycle").val("29");
+ }
+ //#endregion
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ async: false,
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+ //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+ if (HInitTimeCycle != -1) {
+ $('#HBeginDate').prop('disabled', true);
+ $('#HEndDate').prop('disabled', true);
+
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery();
+ } else {
+ $('#HBeginDate').prop('disabled', false);
+ $('#HEndDate').prop('disabled', false);
+ }
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ //get_FastQuery()
+ //form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ //鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
+ var HIsClose_Manual = false;
+ //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ var Filter = document.getElementsByClassName(HClassTag);
+
+ var HFilterIdList = "";//杩囨护鏉′欢
+ var HFilterIdLists = "";//鎷兼帴澶氫釜杩囨护鏉′欢
+ var HValue = "";//杩囨护鍊�
+ var HElement_type = "";//杩囨护鏍囩绫诲瀷
+
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ //褰撳墠椤甸潰涓婃病鏈夐�夋嫨杩囨护鏂规锛岃繘鍏ユ柊澧炴柟娉�
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ //褰撳墠椤甸潰宸叉湁杩囨护鏂规锛岀敤鎴烽�夋嫨 鏂板鎴栬�呯紪杈�
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=' + HModuleName + '&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ //缂栬緫
+ var Filter_Edit = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ HFilterIdList = "";
+ HFilterIdLists = "";
+ HValue = "";
+ HElement_type = "";
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName(HClassTag); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //鍘婚櫎鏈熬閫楀彿
+ HFilterIdLists = HFilterIdLists.substring(0, HFilterIdLists.length - 1);
+ HValue = HValue.substring(0, HValue.length - 1);
+ HElement_type = HElement_type.substring(0, HElement_type.length - 1);
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type + '&HModuleName=' + HModuleName
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgID = params[params[1]];
+
+ var addSWhere = "";
+
+ if (openType == 2) {
+ addSWhere = " and 鐘舵�� = '宸插鏍�' and 琛岀姸鎬� = '' " ;
+ }
+ return addSWhere;
+ }
+ //#endregion
+
+ //#endregion
+
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ //#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagInfoList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagInfoList.html"
index 8afb079..d850ba3 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagInfoList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\256\242\346\210\267\346\240\207\347\255\276/Sc_CustomerTagInfoList.html"
@@ -45,6 +45,18 @@
<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HCustName" id="HCustName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -190,7 +202,7 @@
var HModName = "Sc_CustomerTagInfoList";
var HBillType = "10003";
-
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//#region 銆愯繃婊ゆ柟妗堛��
//杩囨护鏉′欢鐨刢lass绫�
@@ -418,7 +430,7 @@
option.cols = [col];
option.data = data1.data;
- table.render(option);
+ ins = table.render(option);
laypage.render(optionPage);
layer.close(ajaxLoad);
@@ -504,45 +516,40 @@
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
- var HsupId = data[0].hsubid;
- var HQty = data[0].鏁伴噺;
- var HSourceInterID = data[0].婧愬崟涓诲唴鐮�;
- var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
+ if (checkStatus.data.length >= 1) {
+ var HItemSubIDs = "";
+ for (i = 0; i < data.length; i++) {
+ HItemSubIDs += data[i].HItemSubID.toString() + ",";
+ }
+ HItemSubIDs = HItemSubIDs.substring(0, HItemSubIDs.length - 1)
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- if (data[0].鐘舵��=="鍒涘缓") {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Xs_SeOutStockBill/DeltetSeOutStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Sc_CustomerTagInfo/Delete", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HItemSubIDs": HItemSubIDs, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
}
- });
- } else {
- layer.msg('姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
- }
-
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ layer.msg('璇烽�夋嫨鏁版嵁鍒犻櫎锛�');
}
break;
//鍒锋柊
@@ -600,6 +607,8 @@
//#region 蹇�熻繃婊�
function get_FastQuery(table, option) {
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HCustName = $("#HCustName").val();//瀹㈡埛鍚嶇О
var ColName = $("#ColName").val();//澶嶉�夋
var Comparator = $("#Comparator").val()
@@ -677,6 +686,12 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ }
+ if (HCustName) {
+ sWhere += " and 瀹㈡埛鍚嶇О like '%" + HCustName + "%'";
+ }
//sWhere += addSWhereByOpenType();
get_DisplayPage(sWhere);
@@ -686,6 +701,8 @@
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HBillNo").val("");//
+ $("#HMaterNumber").val("");//
+ $("#HCustName").val("");//
$("#ColContent").val("");
$("#ColName").val("0");
@@ -774,6 +791,23 @@
})
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_DayPlanPlatFormHistoryNoteReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_DayPlanPlatFormHistoryNoteReport.html"
new file mode 100644
index 0000000..018ade0
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/JIT_DayPlanPlatFormHistoryNoteReport.html"
@@ -0,0 +1,724 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍘嗗彶鎺掍骇璁板綍鏌ヨ鎶ヨ〃</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">瀵煎叆搴忓垪鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HVersion_Import" id="HVersion_Import" lay-verify="HVersion_Import" class="ForFilteringSchemes">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
+ </div>
+ </div>
+ </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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Export" id="get_Export"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HModName = "JIT_DayPlanPlatFormHistoryNoteReport";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ //閫�鍑烘寜閽�
+ case 'btn-exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
+ break;
+ //瀵煎嚭
+ case "get_Export": get_Export();
+ break;
+ };
+ });
+ //#endregion
+
+ //#region 鍩虹璧勬枡瀵煎叆
+ //#region 鐢熶骇杞﹂棿
+ form.on('submit(btnHWorkShopID)', function (data) {
+ btnHWorkShopID();
+ });
+ //#endregion
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTable)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ getHVersion_Import_init();
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ //get_Display(sWhere);
+
+ get_FastQuery();
+ }
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , limits: [50, 500, 5000, 20000]
+ , limit: 50
+ , cellMinWidth: 90
+
+ };
+ }
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sql) {
+ var ajaxLoad = layer.load();
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async:false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = [];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
+ }
+ }
+ }
+
+ option.cols = [col];
+ option.data = data1.data;
+ ins = table.render(option);
+
+ ////鍒锋柊鎸夐挳鏄剧ず
+ //var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ //var HBillType = "JIT_FuHeFenXiReport";
+ //Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
+ layer.close(ajaxLoad);
+
+ if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
+ ColFilter();
+ }
+
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 蹇�熸煡璇�
+ function get_FastQuery() {
+ var HWorkShopID = $("#HWorkShopID").val();
+ var HVersion_Import = $("#HVersion_Import").val();
+
+ var ColName = $("#ColName").val();//澶嶉�夋
+ var Comparator = $("#Comparator").val()
+ var ColContent = $("#ColContent").val();
+ var ColName1 = $("#ColName1").val();//澶嶉�夋
+ var Comparator1 = $("#Comparator1").val()
+ var ColContent1 = $("#ColContent1").val();
+ var ColName2 = $("#ColName2").val();//澶嶉�夋
+ var Comparator2 = $("#Comparator2").val()
+ var ColContent2 = $("#ColContent2").val();
+
+
+ if (ColName != 0 && Comparator != 0) {
+ ColName = "[" + ColName + "]";//澶嶉�夋
+ var com = "";
+ switch (Comparator) {
+ case "7":
+ com = "like''%" + ColContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + ColContent + "''";
+ break;
+ case "9":
+ com = "like''" + ColContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + ColContent + "%''";
+ break;
+ default:
+ com = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWhere += " and " + ColName + " " + com;
+ }
+ if (ColName1 != 0 && Comparator1 != 0) {
+ ColName1 = "[" + ColName1 + "]";//澶嶉�夋
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like''%" + ColContent1 + "%''";
+ break;
+ case "8":
+ com1 = "like''%" + ColContent1 + "''";
+ break;
+ case "9":
+ com1 = "like''" + ColContent1 + "%''";
+ break;
+ case "10":
+ com1 = "not like''%" + ColContent1 + "%''";
+ break;
+ default:
+ com1 = "" + Comparator1 + "''" + ColContent1 + "''";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ ColName2 = "[" + ColName2 + "]";//澶嶉�夋
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like''%" + ColContent2 + "%''";
+ break;
+ case "8":
+ com2 = "like''%" + ColContent2 + "''";
+ break;
+ case "9":
+ com2 = "like''" + ColContent2 + "%''";
+ break;
+ case "10":
+ com2 = "not like''%" + ColContent2 + "%''";
+ break;
+ default:
+ com2 = "" + Comparator + "''" + ColContent + "''";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
+
+ if (typeof (HVersion_Import) == "undefined" || HVersion_Import == null || HVersion_Import == "") {
+ layer.alert("鏌ヨ澶辫触锛氬鍏ュ簭鍒楀彿鏈�夋嫨锛�", { icon: 5 });
+ sWhere = "";
+ return;
+ }
+
+ var sql = "exec h_p_JIT_DayPlanPlatFormHistoryNoteReport_Query '1900-01-01',0,'','2500-01-01',0,''," + HWorkShopID + ",'','" + HVersion_Import + "','" + sWhere + "'";
+ get_Display(sql);
+
+ //get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆蹇�熸煡璇�
+ function set_ClearQuery() {
+ $("#ColContent").val("");
+ $("#ColName").val("0");
+ $("#Comparator").val("0")
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");;
+ form.render('select');
+
+ $("#btnSearch").click();
+ sWhere = "";
+ }
+ //#endregion
+
+
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ //var ModRightNameCheck = "Cg_PODemandPlanConfigBillReportForLack_ExportExcel";
+
+ ////閫昏緫瀹℃牳鏂规硶
+ //$.ajax({
+ // type: "GET",
+ // url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ // success: function (result) {
+ // if (result.count == 1) {
+ // var addExportStr = ["渚涘簲鍟嗕唬鐮�"];
+ // var data = option.data;
+ // for (var i = 0; i < data.length; i++) {
+ // for (var j = 0; j < addExportStr.length; j++) {
+ // var temp = data[i][addExportStr[j]].indexOf("'");
+ // if (temp != 0) {
+ // data[i][addExportStr[j]] = "'" + data[i][addExportStr[j]];
+ // }
+ // }
+ // }
+ table.exportFile(ins.config.id, option.data, "xls");
+ // } else {
+ // layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ // }
+ // }, error: function () {
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ }
+ //#endregion
+ //#endregion
+
+ //#region 瀵煎叆搴忓垪鍙峰垵濮嬪寲
+ function getHVersion_Import_init() {
+ var sql = "select distinct HVersion_Import from Sc_WorkBillSortBillMain where HVersion_Import <> '' order by HVersion_Import desc";
+ var ModRightNameCheck = "";
+ $.ajax({
+ url: GetWEBURL() + '/CommonModel/searchMethod',
+ async: false,
+ type: "GET",
+ data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var Organization = "";
+ if (data1.count == 1) {
+ var data = data1.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].HVersion_Import + '">' + data[i].HVersion_Import + '</option>';
+ }
+ $("#HVersion_Import").append(Organization);
+ if (data.length > 0) {
+ $("#HVersion_Import").val(data[0].HVersion_Import)
+ }
+ form.render('select');
+ }
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function (e) {
+ layer.alert(e + "鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].Name + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgName").append(Organization);
+ $("#HOrgName").val(sessionStorage["Organization"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+ //#region 閫夋嫨鐢熶骇杞﹂棿
+ function btnHWorkShopID() {
+ var HOrgName = sessionStorage["Organization"];
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
+ $("#HWorkShopIDName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);//杞﹂棿鍚嶇О
+ /*get_WriteConfigFile();*/
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+
+ //#region 闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ //var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ //if (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
index 6e1b012..ca60ebe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportMOMaterReadysBillList.html"
@@ -638,6 +638,12 @@
item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
item[itemobj] = item[itemobj].toString().replace(/,/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
}
+ if (itemobj == "璁㈠崟浜ゆ湡") {
+ item[itemobj] = item[itemobj].toString().split('T')[0];
+ }
+ if (itemobj == "鏃ヨ鍒掓棩鏈�") {
+ item[itemobj] = item[itemobj].toString().split('T')[0];
+ }
}
});
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 05f9d90..82d1058 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"
@@ -17,6 +17,7 @@
<script src="../../../layuiadmin/soulTable.slim.js"></script>
<script src="../../../layuiadmin/PageTitle.js"></script>
<script src="../../../layuiadmin/QueryScheme.js"></script>
+ <script src="../../../layuiadmin/grwebapp.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -2369,6 +2370,9 @@
//娣诲悍瀹㈡埛鏍囩涓�閿墦鍗�
+ var time;
+ var num = 0;
+
function get_PrintCustTag() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -2377,16 +2381,23 @@
if (checkStatus.data.length == 1) {
hmainid = data[0].hmainid;
- hentryid = data[0].hentryid;
+ hentryid = data[0].HEntryID;
$.ajax({
- url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ url: GetWEBURL() + '/Sc_CustomerTagBarCode/Save',
type: "GET",
async: false,
data: { "HICMOInterID": hmainid, "HICMOEntryID": hentryid },
success: function (data1) {
if (data1.count == 1) {
-
+ //鎵撳嵃鏂规硶
+ layer.confirm("纭瑕佹壒閲忔墦鍗板悧?", { title: "纭" }, function (index) {
+ time = setInterval(function () {
+ dy_PL(hmainid, hentryid);
+ }, 2500);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ })
} else {
layer.alert(data1.Message, { icon: 5 });
}
@@ -2400,6 +2411,58 @@
}
}
+ function dy_PL(HICMOInterID, HICMOEntryID) {
+ var sWhere = "select top 2 * from h_v_Sc_CustomerTagBarCodeList where HSourceInterID = " + HICMOInterID + " and HSourceEntryID = " + HICMOEntryID
+ var rest = [];
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Gy_SOPBillList/WindowPrintList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: false,
+ data: { "sWhere": sWhere },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+
+ if (data.data.length != 0) {
+ var dataPrint = [];
+ for (var i = 0; i < data.data.length; i++) {
+ dataPrint.push(data.data[i])
+ }
+ rest = data.data;
+
+ var Customer = {
+ "Table": dataPrint
+ }
+
+ var args = {
+ type: "print",//鎵撳嵃妯″紡
+ //type: "preview",//棰勮妯″紡
+ showOptionDlg: false, //濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+ report: urlAddRandomNo("../../grf/娉曞緥鏍囩.grf"),
+ data: Customer
+ };
+
+ webapp_ws_ajax_run(args);
+
+ if (rest.length <= num + 1) {
+ num = 0;
+ clearInterval(time);
+ } else {
+ num++;
+ }
+ } else {
+ layer.msg("鏌ユ棤鏁版嵁!");
+ }
+ }
+ else {
+ layer.msg(data.Message, { icon: 5 });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("閿欒:" + err, { icon: 5 });
+ }
+ })
+ }
//#region 瀵煎嚭Execel
function get_Export() {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
index 7263036..da8f528 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatFormImport.html"
@@ -121,20 +121,20 @@
contentType: 'application/json',
exts: 'xls|xlsx', //鍏佽涓婁紶鐨勭被鍨�
before: function (data) {
- loadIndex = layer.load(2);
+ layer.load();
},
done: function (data1) {
+ layer.closeAll('loading');
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.close(loadIndex);
} else {
- layer.close(loadIndex);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
},
error: function (err) {
debugger
+ layer.closeAll('loading');
layer.alert('瀵煎叆鍑虹幇寮傚父', { icon: 2 });
}
});
@@ -212,6 +212,7 @@
columns.push({ field: 'ICMOBillHInterID', title: 'ICMOBillHInterID', hide: true});
columns.push({ field: 'ICMOBillHEntryID', title: 'ICMOBillHEntryID', hide: true });
columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
+ columns.push({ field: 'HVersion_Import', title: '瀵煎叆搴忓垪鍙�'});
var k = 0;//鏀堕泦寰幆娆℃暟
var Days = 45;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTimeNew.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTimeNew.html"
index b58ab76..dd576dd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTimeNew.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_BulkEditWorkTimeNew.html"
@@ -149,16 +149,6 @@
set_SaveBill();
})
- // 鐩戝惉鏃ユ湡閫夋嫨
- $('#HBeginDate').on('change', function () {
- get_DisplayDate();
- // 鍦ㄨ繖閲屽鐞嗘棩鏈熼�夋嫨鍚庣殑閫昏緫
- });
-
- $('#HEndDate').on('change', function () {
- get_DisplayDate();
- // 鍦ㄨ繖閲屽鐞嗘棩鏈熼�夋嫨鍚庣殑閫昏緫
- });
//#region 鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
form.on('select(HInitTimeCycle)', function (data) {
@@ -171,8 +161,6 @@
$("#HBeginDate").val(Format(new Date().setDate(new Date().getDate()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
$("#HEndDate").val(Format(new Date().setDate(new Date().getDate() + HInitTimeCycle), "yyyy-MM-dd"));//鑷�
- //鎵ц鏌ヨ鏂规硶
- get_DisplayDate();
} else {
//$('#HDate').prop('disabled', false);
//$('#HDate1').prop('disabled', false);
@@ -205,7 +193,6 @@
//鑾峰彇榛樿杞﹂棿
GetDefValByUser();
//鏌ヨ
- get_DisplayDate();
get_DisplaySource();
}
//#endregion
@@ -267,15 +254,24 @@
, limits: [50, 500, 1000, 5000]
//, loading: false
, cols: [[
- { field: 'index', title: '搴忓彿', width: 80, sort: true },
- { field: 'date', title: '鏃ユ湡', width: 120 },
+ { type: 'numbers', title: '搴忓彿', width: 80},
{ field: 'week', title: '鏄熸湡', width: 120 },
{ field: 'workHours', title: '涓婄彮鏃堕棿', width: 120, edit: 'text' }
]]
+ , data: [
+ { "week": "鏄熸湡鏃�", "workHours": 0 },
+ { "week": "鏄熸湡涓�", "workHours": 0 },
+ { "week": "鏄熸湡浜�", "workHours": 0 },
+ { "week": "鏄熸湡涓�", "workHours": 0 },
+ { "week": "鏄熸湡鍥�", "workHours": 0 },
+ { "week": "鏄熸湡浜�", "workHours": 0 },
+ { "week": "鏄熸湡鍏�", "workHours": 0 }
+ ]
, done: function (res, curr, count) {
soulTable.render(this);
}
};
+ table.render(option);
sourceOption = {
elem: '#SourceTable'
//, toolbar: '#toolbarDemo'
@@ -295,63 +291,6 @@
}
};
}
- //#endregion
-
- //#region 鏌ヨ
- function get_DisplayDate() {
- var HBeginDate = $('#HBeginDate').val();
- var HEndDate = $('#HEndDate').val();
-
- if (!HBeginDate || !HEndDate) {
- layer.msg('璇烽�夋嫨寮�濮嬪拰缁撴潫鏃ユ湡');
- return;
- }
- if (HBeginDate > HEndDate) {
- return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
- }
- // 璁＄畻鏃ユ湡宸苟鐢熸垚琛ㄦ牸鏁版嵁
- var dateArray = getDateRange(HBeginDate, HEndDate);
- var tableData = [];
-
- for (var i = 0; i < dateArray.length; i++) {
- tableData.push({
- index: i + 1,
- date: dateArray[i].date,
- week: dateArray[i].week,
- workHours: 0 // 榛樿涓婄彮鏃堕棿涓�0
- });
- }
- option.data = tableData;
- // 娓叉煋琛ㄦ牸
- table.render(option)
- }
-
- function get_DisplaySource() {
- var HDeptID = $("#HDeptID").val();
- if (HDeptID != 0 && HDeptID != "") {
- var sWhere = " and 绂佺敤鏍囪 != 'Y' and HDeptID=" + HDeptID
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- url: GetWEBURL() + '/Gy_Source/list',
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- sourceOption.data = data1.data;
- table.render(sourceOption);
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
-
- });
- }
-
- }
-
//#endregion
//#region 鐢熶骇杞﹂棿閫夋嫨鎸夐挳
@@ -383,6 +322,34 @@
}
//#endregion
+ //#region 鑾峰彇瀵瑰簲杞﹂棿鐢熶骇璧勬簮
+ function get_DisplaySource() {
+ var HDeptID = $("#HDeptID").val();
+ if (HDeptID != 0 && HDeptID != "") {
+ var sWhere = " and 绂佺敤鏍囪 != 'Y' and HDeptID=" + HDeptID
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Gy_Source/list',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ sourceOption.data = data1.data;
+ table.render(sourceOption);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+
+ });
+ }
+
+ }
+ //#endregion
+
//#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
function setSelect_HInitTimeCycle() {
var valueList = [7,30, 45, 60];
@@ -403,30 +370,32 @@
//#endregion
//#region 鏃堕棿鍒楄〃鐩稿叧鍑芥暟
- function getDateRange(startDate, endDate) {
- var dateArray = [];
- var start = new Date(startDate.replace(/-/g, '/'));
- var end = new Date(endDate.replace(/-/g, '/'));
+ function generateWorkHoursData(startDate, endDate, originalData) {
+ const result = [];
+ const currentDate = new Date(startDate);
+ const lastDate = new Date(endDate);
- while (start <= end) {
-
- var dateStr = Format(start,"yyyy-MM-dd");
- var weekStr = getWeekDay(start);
+ // 鍒涘缓涓�涓槦鏈熸槧灏勮〃锛堜腑鏂囨槦鏈熷悕 -> workHours锛�
+ const weekHoursMap = {};
+ originalData.forEach(item => {
+ weekHoursMap[item.week] = item.workHours;
+ });
- dateArray.push({
- date: dateStr,
- week: weekStr
+ // 閬嶅巻鏃ユ湡鑼冨洿
+ while (currentDate <= lastDate) {
+ const dayOfWeek = currentDate.toLocaleDateString('zh-CN', { weekday: 'long' }); // 鑾峰彇涓枃鏄熸湡鍚嶏紝濡� "鏄熸湡涓�"
+ const formattedDate = currentDate.toISOString().split('T')[0]; // 鏍煎紡鍖栦负 YYYY-MM-DD
+
+ result.push({
+ date: formattedDate,
+ week: dayOfWeek,
+ workHours: weekHoursMap[dayOfWeek] || 0, // 濡傛灉娌℃湁鍖归厤鐨勬槦鏈燂紝榛樿 0
});
- start.setDate(start.getDate() + 1);
+ currentDate.setDate(currentDate.getDate() + 1); // 涓嬩竴澶�
}
- return dateArray;
- }
- // 鑾峰彇鏄熸湡鍑�
- function getWeekDay(date) {
- var weekDays = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�'];
- return weekDays[date.getDay()];
+ return result;
}
//#endregion
@@ -459,8 +428,13 @@
function set_SaveBill() {
var checkStatus = table.checkStatus('SourceTable')
, data = checkStatus.data;
- var sSubStr = JSON.stringify(table.cache["mainTable"]);
- var sMainSub = JSON.stringify(data) + ';' + sSubStr + ';' + sessionStorage["HUserName"];
+ var sSubStr = table.cache["mainTable"];
+ //鏍规嵁寮�濮嬫椂闂寸粨鏉熸棩鏈熺敓鎴愭柊鏁版嵁
+ const newData = generateWorkHoursData($("#HBeginDate").val(), $("#HEndDate").val(), sSubStr);
+ if (newData.length == 0) {
+ return layer.msg("璇锋鏌ュ紑濮嬫椂闂村拰缁撴潫鏃ユ湡鏄惁鍚堢悊");
+ }
+ var sMainSub = JSON.stringify(data) + ';' + JSON.stringify(newData) + ';' + sessionStorage["HUserName"];
if (data.length > 0) {
$.ajax({ //寮傛璇锋眰
type: "POST", //璇锋眰绫诲瀷
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
index 399556c..aae3934 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/Sc_ShopCalendar.html"
@@ -274,7 +274,7 @@
, title: "鎵规敼涓婄彮宸ユ椂" //鏍囬
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "80%"] //绐椾綋澶у皬
+ , area: ["60%", "80%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
, content: ['./Sc_BulkEditWorkTimeNew.html', "yes"]
})
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index 491ce94..0e480fe 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -847,7 +847,13 @@
}
//#region 蹇�熻繃婊�
- function get_FastQuery(table, option,number) {
+ function get_FastQuery(table, option, number) {
+ //鍒ゆ柇鏄惁鏈夊鍏ユ潈闄愶紝濡傛灉鏈夊垯灏嗘�昏杞﹂棿涔嬪墠鐨勬棩璁″垝宸ュ崟浣滃簾
+ if (!set_ModCheck("Kf_POStockInBillQuery")) {
+ layer.msg("鏃犳潈闄愶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
--
Gitblit v1.9.1