From a286c00f5ead3a614a4367abb5986b4aa8624395 Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期二, 15 四月 2025 11:02:30 +0800 Subject: [PATCH] 1 --- WebTM/layuiadmin/modules/tableSelect.js | 78 +----- WebTM/views/基础资料/生产基础资料/Gy_BadReason.html | 4 WebTM/views/生产管理/报工平台_PDA/质量汇报/Sc_QualityReportBill_PDA.html | 158 +++++++++--- WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 30 +- WebTM/views/质量管理/质量报表/QC_TechParamReport.html | 58 ++++ WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html | 43 +++ WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 101 +------ WebTM/views/生产管理/报工平台_PDA/IpadIndex_PDA.html | 2 WebTM/views/生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html | 4 WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 34 ++ WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 63 +++- WebTM/views/生产管理/质量汇报单/Sc_QualityReportBillSumSave.html | 86 ++++++ 12 files changed, 435 insertions(+), 226 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user index b95618e..009a803 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-04-09T06:08:32.6168006Z;False|2025-04-09T14:08:07.4612683+08:00;True|2025-04-09T09:22:23.2993013+08:00;False|2025-04-09T09:22:00.8406328+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>False|2025-04-14T03:18:10.4843773Z;True|2025-04-10T15:37:23.4678456+08:00;True|2025-04-10T15:36:04.0127474+08:00;True|2025-04-10T15:34:47.4560484+08:00;False|2025-04-10T15:34:00.6737081+08:00;True|2025-04-09T17:23:31.1521947+08:00;False|2025-04-09T17:23:05.4299612+08:00;True|2025-04-09T14:08:32.6168006+08:00;False|2025-04-09T14:08:07.4612683+08:00;True|2025-04-09T09:22:23.2993013+08:00;False|2025-04-09T09:22:00.8406328+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>04/09/2025 14:07:58</publishTime> + <publishTime>04/14/2025 12:18:14</publishTime> </File> <File Include="bin/WebTM.pdb"> <publishTime>04/27/2021 20:31:08</publishTime> - <publishTime>04/09/2025 14:07:58</publishTime> + <publishTime>04/14/2025 12:18:14</publishTime> </File> <File Include="HtmlPage1.html"> <publishTime>02/12/2025 08:50:01</publishTime> @@ -2319,7 +2319,7 @@ <File Include="views/index.html"> <publishTime>04/27/2021 13:45:58</publishTime> <publishTime>04/30/2021 08:42:02</publishTime> - <publishTime>03/03/2025 10:54:20</publishTime> + <publishTime>04/09/2025 17:12:30</publishTime> </File> <File Include="views/indexMenu.html"> <publishTime>04/02/2025 17:12:13</publishTime> @@ -3348,6 +3348,9 @@ <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Pay_PeriodInfoSet.html"> <publishTime>02/12/2025 08:50:01</publishTime> </File> + <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Sb_EqiupMaterWorkTime.html"> + <publishTime>04/09/2025 17:12:30</publishTime> + </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Xt_ORGANIZATIONSList.html"> <publishTime>02/12/2025 08:50:01</publishTime> </File> @@ -3703,6 +3706,9 @@ </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Pay_PeriodInfoSet.html"> <publishTime>02/12/2025 08:50:01</publishTime> + </File> + <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Sb_EqiupMaterWorkTime.html"> + <publishTime>04/09/2025 17:12:30</publishTime> </File> <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/SumAdd_Gy_RestDay.html"> <publishTime>02/12/2025 08:50:01</publishTime> @@ -4310,7 +4316,7 @@ <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html"> <publishTime>04/12/2021 11:31:26</publishTime> <publishTime>04/12/2021 11:31:26</publishTime> - <publishTime>03/24/2025 10:44:39</publishTime> + <publishTime>04/10/2025 15:37:11</publishTime> </File> <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason_Excel.html"> <publishTime>02/12/2025 08:50:02</publishTime> @@ -5510,7 +5516,7 @@ <publishTime>03/19/2025 14:57:40</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/涓嶈壇閲囬泦/Sc_QualityReportStepBill_New.html"> - <publishTime>04/08/2025 08:54:54</publishTime> + <publishTime>04/10/2025 17:38:01</publishTime> </File> <File Include="views/鐢熶骇绠$悊/鎶ュ伐鍙板伐搴�/浜ч噺姹囨姤/Sc_Add_ProductReportStepBillList.html"> <publishTime>03/21/2025 10:08:33</publishTime> @@ -5921,7 +5927,7 @@ <publishTime>02/12/2025 08:50:02</publishTime> </File> <File Include="views/鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillSumSave.html"> - <publishTime>02/12/2025 08:50:02</publishTime> + <publishTime>04/10/2025 16:35:09</publishTime> </File> <File Include="views/鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill_PDA.html"> <publishTime>02/12/2025 08:50:02</publishTime> @@ -6416,7 +6422,7 @@ <publishTime>02/12/2025 08:50:02</publishTime> </File> <File Include="views/璁惧绠$悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillEdit.html"> - <publishTime>04/08/2025 16:21:59</publishTime> + <publishTime>04/11/2025 17:39:02</publishTime> </File> <File Include="views/璁惧绠$悊/璁惧宸ヨ壓鍙傛暟璁㈠崟鐐规琛�/SB_EquipICMOTechParamBillList.html"> <publishTime>04/08/2025 08:54:54</publishTime> @@ -6842,7 +6848,7 @@ <publishTime>02/12/2025 08:50:02</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/QC_TechParamReport.html"> - <publishTime>02/25/2025 10:05:52</publishTime> + <publishTime>04/10/2025 10:48:24</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/璐ㄩ噺鎶ヨ〃/SB_TechnologyParameterList.html"> <publishTime>02/12/2025 08:50:02</publishTime> @@ -6878,7 +6884,7 @@ <publishTime>02/12/2025 08:50:02</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList2.html"> - <publishTime>04/08/2025 08:53:29</publishTime> + <publishTime>04/11/2025 17:39:04</publishTime> </File> <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckReport_ZDQX.html"> <publishTime>02/12/2025 08:50:02</publishTime> @@ -7087,7 +7093,7 @@ <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html"> <publishTime>04/25/2021 08:45:34</publishTime> <publishTime>04/25/2021 08:45:34</publishTime> - <publishTime>04/02/2025 17:12:13</publishTime> + <publishTime>04/14/2025 12:17:40</publishTime> </File> <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillSubList.html"> <publishTime>02/12/2025 08:50:02</publishTime> @@ -8328,7 +8334,7 @@ </File> <File Include="Web.config"> <publishTime>04/27/2021 20:31:08</publishTime> - <publishTime>04/09/2025 14:08:12</publishTime> + <publishTime>04/14/2025 12:18:33</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebTM/layuiadmin/modules/tableSelect.js b/WebTM/layuiadmin/modules/tableSelect.js index 04b4964..6d7fa06 100644 --- a/WebTM/layuiadmin/modules/tableSelect.js +++ b/WebTM/layuiadmin/modules/tableSelect.js @@ -25,6 +25,7 @@ opt.table.height = opt.table.height || 290; elem.off('keyup').on('keyup', function(e) { e.stopPropagation(); + //杈撳叆瀛楃灏忎簬浜屾垨鑰呯壒娈婃寜閽笉鏄剧ず if ($('div.tableSelect').length >= 1 || elem.val().length <= 2 || event.key == "F7" || event.key == "F8" || event.key == "F6") { return false; } @@ -44,10 +45,15 @@ opt.table.elem = "#"+tableName; opt.table.id = tableName; //鑻ユ病鏈塽rl琛ㄧず涓哄墠绔垎椤� - if (opt.table.url != undefined) { - opt.table.where['sWhere'] = opt.sWhere - } else { - opt.table.data = opt.ajaxSelect(opt.sWhere); + //if (opt.table.url != undefined) { + // opt.table.where['sWhere'] = opt.sWhere + //} else { + // opt.table.data = opt.ajaxSelect(opt.sWhere); + //} + //璁╀竴娆″姞杞芥樉绀烘暟鎹� + //褰撳瓧绗﹂暱搴︾瓑浜�3鏃剁涓�娆″姞杞� + if (elem.val().length == 3) { + searchFirst() } opt.table.request={//璁剧疆椤靛弬鏁� pageName: 'page', // 椤电爜鐨勫弬鏁板悕绉帮紝榛樿锛歱age @@ -61,56 +67,8 @@ "data": res.data // 瑙f瀽鏁版嵁鍒楄〃 }; } - //鐢╦ump鏇夸唬鍘熸潵琛ㄦ牸pagejump鐢ㄤ簬鏇存柊鎸夐挳閫変腑鏁伴噺姝ゅ姛鑳藉彂鐜版棤鐢ㄥ垹闄� - //opt.table.done = function (res, curr, count, origin) { - // this.page.jump = jump; - //} var tableSelect_table = table.render(opt.table); - //璁╀竴娆″姞杞芥樉绀烘暟鎹� - let executed = false; - if (elem.val().length == 3 && !executed) { - executed = true; - search(); - } - //jump鍒嗛〉瑙﹀彂鍑芥暟 - //function jump(obj, first) { - // table.reload(tableName); - // //鏇存柊鎸夐挳 - // updataButton(table.checkStatus(tableName).data.length) - //} - - //鏇存柊閫変腑鏁伴噺 - function updataButton (n) { - tableBox.find('.tableSelect_btn_select span').html(n==0?'':'('+n+')') - } - - //鏁扮粍鍘婚噸 - function uniqueObjArray(arr, type){ - var newArr = []; - var tArr = []; - if(arr.length == 0){ - return arr; - }else{ - if(type){ - for(var i=0;i<arr.length;i++){ - if(!tArr[arr[i][type]]){ - newArr.push(arr[i]); - tArr[arr[i][type]] = true; - } - } - return newArr; - }else{ - for(var i=0;i<arr.length;i++){ - if(!tArr[arr[i]]){ - newArr.push(arr[i]); - tArr[arr[i]] = true; - } - } - return newArr; - } - } - } //FIX浣嶇疆濡備綍涓嬮潰鏀句笉涓嬫斁涓婇潰 var overHeight = (elem.offset().top + elem.outerHeight() + tableBox.outerHeight() - $(window).scrollTop()) > $(window).height(); @@ -181,8 +139,8 @@ timeout = setTimeout(() => func.apply(context, args), wait); }; } - //鎼滅储鍑芥暟 - function search() { + //鎼滅储鍑芥暟绗竴娆″姞杞� + function searchFirst() { var searchKeyList = opt.searchKey.split(',');//鑾峰彇鏌ユ壘鐨勫叧閿瓧鎼滅储妗� //鎷兼帴sql瀛楃涓� var sWhereStr = " and (" @@ -197,17 +155,9 @@ //鍚庣鍒嗛〉鎼滅储 if (opt.table.where != undefined) { opt.table.where['sWhere'] = opt.sWhere + sWhereStr; - tableSelect_table.reload({ - where: opt.table.where, - page: { - curr: 1 - } - }); } else { var sWhere = opt.sWhere + sWhereStr; - tableSelect_table.reload({ - data: opt.ajaxSelect(sWhere) - }); + opt.table.data = opt.ajaxSelect(sWhere); } } @@ -243,7 +193,7 @@ }); } - },200)) + },500)) //鍙屽嚮琛岄�変腑 table.on('rowDouble('+tableName+')', function(obj){ 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_BadReason.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_BadReason.html" index 307d683..5306894 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_BadReason.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_BadReason.html" @@ -540,9 +540,9 @@ } if (HProcName) { sWhere += " and 榛樿宸ュ簭 like '%" + HProcName + "%'"; - } - sWhere += " order by 涓嶈壇鍘熷洜浠g爜"; + } sWhere += addSWhereByOpenType(); + sWhere += " order by 涓嶈壇鍘熷洜浠g爜"; get_Display(sWhere); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" index 403e217..d7e47ce 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBillList.html" @@ -753,10 +753,10 @@ sWhere += " and " + ColName2 + " " + com2; } if (HDate) { - sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'"; + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'"; } if (HDate1) { - sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'"; + sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'"; } if (HBillNo) { sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'"; diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" index 58175aa..97ce444 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\270\215\350\211\257\351\207\207\351\233\206/Sc_QualityReportStepBill_New.html" @@ -1178,6 +1178,17 @@ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛� setSelectHResultByTableRender(); + for (var i = 1; i <= option.data.length; i++) { + $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠g爜); + $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭); + $('#HBadProcName' + i + '').val(option.data[i - 1].璐d换宸ュ簭); + $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳); + $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮); + $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜); + $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄); + } + form.render('select'); + layer.close(ajaxLoad); } else { layer.close(ajaxLoad); @@ -1756,8 +1767,20 @@ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓� + //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛� setSelectHResultByTableRender(); + + for (var i = 1; i <= option.data.length; i++) { + $('#HMaterNumber' + i + '').val(option.data[i - 1].HBadReasonNumber); + $('#HNowProcName' + i + '').val(option.data[i - 1].HBadPhenomenaName); + $('#HBadProcName' + i + '').val(option.data[i - 1].HBadPhenomenaName); + $('#HEmpName' + i + '').val(option.data[i - 1].HBadPhenomenaName); + $('#HSourceName' + i + '').val(option.data[i - 1].HBadPhenomenaName); + $('#HBadReason' + i + '').val(option.data[i - 1].HBadPhenomenaName); + $('#HBadPhenomena' + i + '').val(option.data[i - 1].HBadPhenomenaName); + } + form.render('select'); } } //#endregion @@ -2274,11 +2297,31 @@ //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛� setSelectHResultByTableRender(); + for (var i = 1; i <= option.data.length; i++) { + $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠g爜); + $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭); + $('#HBadProcName' + i + '').val(option.data[i - 1].璐d换宸ュ簭); + $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳); + $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮); + $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜); + $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄); + } + form.render('select'); } else { table.render(option); //鍒锋柊琛ㄦ牸鍚屾椂鏍规嵁option涓璈Result鍊艰缃笅鎷夊垪琛� setSelectHResultByTableRender(); + for (var i = 1; i <= option.data.length; i++) { + $('#HMaterNumber' + i + '').val(option.data[i - 1].鐗╂枡浠g爜); + $('#HNowProcName' + i + '').val(option.data[i - 1].褰撳墠宸ュ簭); + $('#HBadProcName' + i + '').val(option.data[i - 1].璐d换宸ュ簭); + $('#HEmpName' + i + '').val(option.data[i - 1].妫�楠屽憳); + $('#HSourceName' + i + '').val(option.data[i - 1].鐢熶骇璧勬簮); + $('#HBadReason' + i + '').val(option.data[i - 1].涓嶈壇鍘熷洜); + $('#HBadPhenomena' + i + '').val(option.data[i - 1].涓嶈壇鐜拌薄); + } + form.render('select'); } }, error: function () { layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" index c38cc36..bfca832 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/IpadIndex_PDA.html" @@ -1038,7 +1038,7 @@ , shade: 0.6 , maxmin: false , anim: 0 - , content: ['鐢熶骇绠$悊/璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes'] + , content: ['../../鐢熶骇绠$悊/鎶ュ伐骞冲彴_PDA/璐ㄩ噺姹囨姤/Sc_QualityReportBill_PDA.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HBillType + '&HICMOEntryID=' + HSourceEntryID, 'yes'] , resize: false , cancel: function () { diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/\350\264\250\351\207\217\346\261\207\346\212\245/Sc_QualityReportBill_PDA.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/\350\264\250\351\207\217\346\261\207\346\212\245/Sc_QualityReportBill_PDA.html" index 3cb7e38..3ae3720 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/\350\264\250\351\207\217\346\261\207\346\212\245/Sc_QualityReportBill_PDA.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\271\263\345\217\260_PDA/\350\264\250\351\207\217\346\261\207\346\212\245/Sc_QualityReportBill_PDA.html" @@ -7,15 +7,15 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <!--寮曠敤layui鏍峰紡鏂囦欢--> - <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> - <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <link rel="stylesheet" href="../../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../../layuiadmin/style/admin.css" media="all"> <!--寮曠敤layui js鏂囦欢--> - <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/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> .layui-form-label { @@ -78,7 +78,7 @@ <div class="layui-tab-content"> <div class="layui-tab-item layui-show"> <div class="layui-form-item" style="padding:0px;margin:0px"> - <div class="layui-row"> + <div class="layui-row" style="display:none"> <div class="layui-col-xs2"> <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label> </div> @@ -93,7 +93,7 @@ </div> </div> - <div class="layui-form-item" style="padding:0px;margin:0px"> + <div class="layui-form-item" style="padding: 0px; margin: 0px; display: none"> <div class="layui-row"> <div class="layui-col-xs2"> <label class="layui-form-label" style="width:60px;padding-left:0px;">娴佹按鍙�</label> @@ -109,7 +109,7 @@ </div> </div> - <div class="layui-form-item" style="padding:0px;margin:0px"> + <div class="layui-form-item" style="padding: 0px; margin: 0px; display: none"> <div class="layui-row"> <div class="layui-col-xs2"> <label class="layui-form-label" style="width:60px;padding-left:0px;">褰撳墠宸ュ簭</label> @@ -204,7 +204,7 @@ <div class="layui-form-item" style="padding:0px;margin:0px"> <div class="layui-row"> <div class="layui-col-xs2"> - <label class="layui-form-label" style="width:60px;padding-left:0px;">浜у搧鍚嶇О</label> + <label class="layui-form-label" style="width:60px;padding-left:0px;">瑙勬牸鍨嬪彿</label> </div> <div class="layui-col-xs10"> <input type="text" name="HMaterModel" class="layui-input" id="HMaterModel" placeholder="瑙勬牸鍨嬪彿" style="border-radius: 50px;background-color:#efefef4d;" readonly> @@ -411,7 +411,7 @@ <script> layui.config({ - base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� }).extend({ index: 'lib/index' //涓诲叆鍙fā鍧� }).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () { @@ -457,7 +457,12 @@ if (typeof (params[params[0]]) == "undefined") { var OperationType = 1;//鎿嶄綔绫诲瀷 var closeType = 2; //鍏抽棴绫诲瀷 - } + } else { + var OperationType = params[params[0]];//鎿嶄綔绫诲瀷 + var linterid = params[params[1]];//婧愬崟id + var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷 + var HBillSubType = decodeURI(params[params[4]] == undefined ? '' : params[params[4]]);//鍗曟嵁瀛愮被鍨� 鐢ㄤ簬鍖哄垎鐢熶骇璁板綍鍗� + } /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁� @@ -481,6 +486,7 @@ GetDefValByUser(); //鍒濆鍖栬〃鏍� set_InitGrid(); + set_AddNew(linterid); } //#region 閫氳繃鐧诲綍鐢ㄦ埛鑾峰彇榛樿鍊� @@ -494,8 +500,8 @@ var data = result.data[0]; form.val("formData", { - "HSourceID": data.HSourceID, - "HSourceName": data.鐢熶骇璧勬簮鍚嶇О, + //"HSourceID": data.HSourceID, + //"HSourceName": data.鐢熶骇璧勬簮鍚嶇О, "HGroupID": data.HGroupID, "HGroupName": data.鐢熶骇鐝粍鍚嶇О, "HEmpID": data.HEmpID, @@ -512,12 +518,70 @@ } //#endregion - - //鍒濆鍩烘湰淇℃伅璧嬪�� - $("#HMaker").val(sessionStorage["HUserName"]); - $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); - $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); + //#region 鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅 + function set_AddNew(linterid) { + //鍒濆鍩烘湰淇℃伅璧嬪�� + $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡 + $("#HBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //寮�濮嬫椂闂� + $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡 + $("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜� + $("#HSTOCKORGID").val(sessionStorage["OrganizationID"]); //缁勭粐ID + $("#HSTOCKORG").val(sessionStorage["Organization"]); //缁勭粐鍚嶇О + //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶) + $('#HProcName').attr("disabled", true); + $('#HSourceName').attr("disabled", true); + $('#ProductionResources-BT').addClass("layui-btn-disabled").attr("disabled", true); + $('#HMainSourceBillNo').attr("disabled", true); + $('#HICMOBillNo').attr("disabled", true); + $('#HDeptName').attr("disabled", true); + $('#HDept-BT').addClass("layui-btn-disabled").attr("disabled", true); + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + "/Sc_QualityReportBill/get_ICMOBillStatus_Tmp", + type: "GET", + data: { "HInterID": linterid, "HEntryID": 0, "HBillType": HSouceBillType }, + success: function (result) { + var data = result.data[0]; + if (result.count == 1) { + $("#HICMOBillNo").val(data.HICMOBillNo); + $("#HICMOInterID").val(data.HICMOInterID); + $("#HMainSourceBillType").val(HSouceBillType); + $("#HMainSourceInterID").val(data.HICMOInterID); + $("#HMainSourceEntryID").val(data.HICMOEntryID); + $("#HMainSourceBillNo").val(data.HICMOBillNo); + $("#HMaterNumber").val(data.HMaterNumber); + $("#HMaterName").val(data.HMaterName); + $("#HMaterID").val(data.HMaterID); + $("#HMaterModel").val(data.HMaterModel); + $("#HICMOEntryID").val(data.HICMOEntryID); + $("#HDeptID").val(data.HDeptID); + $("#HDeptName").val(data.HDeptName); + $("#HSourceID").val(data.HSourceID); + $("#HSourceName").val(data.HSourceName); + $("#HUnitID").val(data.HUnitID); + $("#HUnitName").val(data.HUnitName); + $("#HProcID").val(data.HProcID); //宸ュ簭ID + $("#HProcNo").val(data.HProcName); //宸ュ簭鍚嶇О + + if (HSouceBillType == "3772") { + $("#HQty").val(data.HDatePlanQty); + $("#HProcExchBillNo").val(data.HSourceBillNo); + $("#HProcExchInterID").val(data.HSourceInterID); + $("#HProcExchEntryID").val(data.HSourceEntryID); + } + + } else { + layer.alert(result.Message, { icon: 5 }); + } + layer.close(ajaxLoad); + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + } + //#endregion //鏉″舰鐮佸洖杞︽柟娉� 娴佽浆鍗� $('#HBarCode').on('keydown', function (event) { @@ -542,10 +606,10 @@ layer.msg("鏉″舰鐮佷笉鑳戒负绌猴紒") return; } - if (!HProcName) { - layer.msg("宸ュ簭涓嶈兘涓虹┖锛�") - return; - } + //if (!HProcName) { + // layer.msg("宸ュ簭涓嶈兘涓虹┖锛�") + // return; + //} if (!HSourceName) { layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�") return; @@ -792,9 +856,29 @@ //鎻愪氦 form.on('submit(Saver)', function (data) {//鎻愪氦 - if ($("#HProcNo").val() == "") { - layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return; + if ($("#HSourceID").val() == '' || $("#HSourceID").val() == null || $("#HSourceID").val() == 0) { + layer.msg("鐢熶骇璧勬簮涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HMainSourceInterID").val() == '' || $("#HMainSourceInterID").val() == null || $("#HMainSourceInterID").val() == 0) { + layer.msg("婧愬崟鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null || $("#HEmpID").val() == '0') { + layer.msg("鎿嶄綔鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null || $("#HGroupID").val() == '0') { + layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null || $("#HDeptID").val() == '0') { + layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; + } + if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null || $("#HICMOInterID").val() == '0') { + layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return Result = false; } //鑾峰彇瀛愯〃鏁版嵁 var num = []; @@ -896,7 +980,7 @@ , area: ['90%', '90%']//澶у皬 , title: '閮ㄩ棬鍒楄〃'//鏍囬 , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'] + , content: ['../../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'] , btn: ['纭畾', '鍙栨秷'] , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 @@ -925,7 +1009,7 @@ , shade: 0.6 //閬僵閫忔槑搴� //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: [`../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes'] + , content: [`../../../Baseset/鍩虹璧勬枡/Gy_GetProcNoList.html?HInterID=${value}`, 'yes'] , resize: false , cancel: function (index, layero) { } @@ -951,7 +1035,7 @@ , shade: 0.6 //閬僵閫忔槑搴� , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes'] + , content: ['../../../Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html', 'yes'] , resize: false , cancel: function (index, layero) { } @@ -967,7 +1051,7 @@ , shade: 0.6 //閬僵閫忔槑搴� , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'] + , content: ['../../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes'] , btn: ['纭畾', '鍙栨秷'] , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 @@ -994,7 +1078,7 @@ , shade: 0.6 //閬僵閫忔槑搴� //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚� - , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes'] + , content: ['../../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes'] , resize: false , cancel: function (index, layero) { } @@ -1003,16 +1087,12 @@ // 鏂板鎸夐挳 form.on('submit(Add)', function () {//鎻愪氦 - layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) { - location.replace('Sc_QualityReportBill_PDA.html'); - }); + Pub_Close2(1); }) //閫�鍑�--鍏ㄥ睆鐗� form.on('submit(Cancel)', function () { - layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) { - parent.location.href = "../../../views/index_Mobile.html"; - }); + Pub_Close2(1); }) 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/MaterialShorAnalysisReport.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/MaterialShorAnalysisReport.html" index ed52a1b..979a3a6 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/MaterialShorAnalysisReport.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/MaterialShorAnalysisReport.html" @@ -5,14 +5,15 @@ <title>缂烘枡鍒嗘瀽鎶ヨ〃</title> <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all"> <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> <script src="../../../layuiadmin/layui/layui.js"></script> <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> <script src="../../../layuiadmin/PubCustom.js"></script> - <script src="../../../layuiadmin/soulTable.slim.js"></script> - + <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--> + <script src="../../../layuiadmin/SetColumn.js"></script> </head> <body> <div class="layui-fluid"> @@ -51,7 +52,7 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button> <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:10px;"> <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;"> <div class="layui-inline"> <label class="layui-form-label">杩囨护</label> @@ -135,7 +136,7 @@ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2"> </div> </div> - </div> + </div>--> </div> </div> </div> @@ -160,6 +161,7 @@ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� }).extend({ index: 'lib/index', //涓诲叆鍙fā鍧� + soulTable: '../ext/soulTable' }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () { //#region 鍏敤鍙橀噺 var $ = layui.$ @@ -194,7 +196,7 @@ switch (obj.event) { //闅愯棌鍒楄缃� case 'HideColumn': - get_HideColumn(); + get_HideColumnNoPageForPlan(HModName, option, get_FastQuery); break; }; }); @@ -234,12 +236,13 @@ $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), 'yyyy-MM-dd')); //鐢熶骇缁勭粐鍔犺浇 Organ(); + //鍒濆鍖栬〃鏍� + set_InitGrid(); ////鍒濆鍖栬〃鏍� //set_InitGrid(); //蹇�熻繃婊� get_FastQuery(1); - DisPlay_HideColumn(); - ColFilter(); + //ColFilter(); } //#endregion @@ -247,13 +250,13 @@ function set_InitGrid() { var columns = []; - columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: true }); - columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true }); - columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }); - columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: true }); - columns.push({ field: '鍦ㄩ�旀暟閲�', title: '鍦ㄩ�旀暟閲�', totalRow: true }); - columns.push({ field: 'CountHQty', title: '鍚堣', sort: true }); - columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true, totalRow: true}); + columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: false, filter: true }); + columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: false, filter: true }); + columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: false, filter: true }); + columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: false, filter: true }); + columns.push({ field: '鍦ㄩ�旀暟閲�', title: '鍦ㄩ�旀暟閲�', totalRow: true, filter: true }); + columns.push({ field: 'CountHQty', title: '鍚堣', sort: false, filter: true }); + columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: false, totalRow: true, filter: true}); //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸� var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂� var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿 @@ -377,6 +380,8 @@ success: function (result) { if (result.count == 1) { option.data = result.data; + //鍒楄缃� + DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option); table.render(option); layer.close(ajaxLoad); //layer.alert("鏌ヨ鎴愬姛", { icon: 1 }); @@ -413,71 +418,6 @@ 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 (HBEGINDATE > HENDDATE) { return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!"); } @@ -633,8 +573,7 @@ //, HXQD: HXQD //, HPURORDERNO: HPURORDERNO } - //鍒濆鍖栬〃鏍� - set_InitGrid(); + get_Display(JSON.stringify(sWhere)); sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨 } diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" index 661682a..cbf8154 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillSumSave.html" @@ -221,6 +221,16 @@ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>--> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> </script> + <!--涓嶈壇鍘熷洜鍗曞厓鏍兼寜閽�--> + <script type="text/html" id="HBadReasonbtn"> + <input type="text" class="layui-input" name="HBadReason" id="HBadReason{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏--> + <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadReasonbtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a> + </script> + <!--涓嶈壇鐜拌薄鍗曞厓鏍兼寜閽�--> + <script type="text/html" id="HBadPhenomenabtn"> + <input type="text" class="layui-input" name="HBadPhenomena" id="HBadPhenomena{{d.LAY_TABLE_INDEX+1}}" style="float:left;width:105px;height:175%;margin: -5px -5px -30px -15px !important"><!--涓婂彸涓嬪乏--> + <a class="layui-btn layui-btn-xs layui-btn-normal" layui-icon-search lay-event="HBadPhenomenabtn" style="float:right;width:35px;height:38px; background-color:transparent;border-style:none;color:black;font-size:20px;">...</a> + </script> <script> var HMaterID = ""; // 鐗╂枡ID var HMaterNumber = ""; // 鐗╂枡浠g爜 @@ -422,7 +432,10 @@ table.cache["mainTable"].push(NewRow); option.data = table.cache["mainTable"]; table.render(option); - + for (var i = 1; i <= option.data.length; i++) { + $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber); + $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName); + } form.render('select'); break; case 'btn-CopyLine': @@ -439,7 +452,10 @@ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂 option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓� table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓� - + for (var i = 1; i <= option.data.length; i++) { + $('#HBadReason' + i + '').val(option.data[i - 1].HBadReasonNumber); + $('#HBadPhenomenabtn' + i + '').val(option.data[i - 1].HBadPhenomenaName); + } form.render('select'); } break; @@ -459,6 +475,68 @@ table.on('tool(mainTable)', function (obj) { set_GridDelete(obj); //琛屽唴鍒犻櫎 set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫� + //涓嶈壇鍘熷洜 + if (obj.event == 'HBadReasonbtn') { + var HProcName = obj.data.HProcName; + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "涓嶈壇鍘熷洜鍒楄〃" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["90%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html?Type=BadReason&HProcName=' + HProcName + '&openType=2', 'yes'] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鎸夐挳涓� 鐨勫洖璋� + var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹� + + if (checkStatus.data.length != 1) { + return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�"); + } + //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹� + obj.update({ + "HBadReasonID": checkStatus.data[0].HItemID + , "HBadReasonNumber": checkStatus.data[0].涓嶈壇缂洪櫡浠g爜 + , "HBadReasonHName": checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О + }) + $("#HBadReason" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇缂洪櫡鍚嶇О) + layer.close(index);//鍏抽棴寮圭獥 + } + }) + } + //涓嶈壇鐜拌薄 + if (obj.event == 'HBadPhenomenabtn') { + layer.open({ + type: 2 + , skin: "layui-layer-rim" //鍔犱笂杈规 + , title: "涓嶈壇鐜拌薄" //鏍囬 + , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡 + , shift: 2 //寮瑰嚭鍔ㄧ敾 + , area: ["90%", "90%"] //绐椾綋澶у皬 + , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀� + , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_BadPhenomena.html?openType=2', "yes"] + , btn: ["纭畾", "鍙栨秷"] + , btn1: function (index, laero) { + //鎸夐挳涓� 鐨勫洖璋� + var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹� + + if (checkStatus.data.length != 1) { + return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�"); + } + obj.update({ + "HBadPhenomenaID": checkStatus.data[0].HItemID + , "HBadPhenomenaName": checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О + }) + $("#HBadPhenomenaName" + (Number($(obj.tr).attr("data-index")) + Number(1))).val(checkStatus.data[0].涓嶈壇鐜拌薄鍚嶇О) + layer.close(index);//鍏抽棴寮圭獥 + } + , btn2: function (index, layero) { } + }) + } }); //#endregion @@ -546,9 +624,9 @@ , { field: 'HUnitName', title: '璁¢噺鍗曚綅', style: 'background-color: #f9f9f9;' } , { field: 'HBadReasonID', title: '涓嶈壇鍘熷洜id', hide: true } , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠g爜', edit: 'text' , event: "HBadReasonNumber"} - , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;' } + , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜', style: 'background-color: #f9f9f9;', templet: '#HBadReasonbtn' } , { field: 'HBadPhenomenaID', title: '涓嶈壇鐜拌薄id', hide: true } - , { field: 'HBadPhenomenaName', title: '涓嶈壇鐜拌薄', edit: 'text', event: "HBadPhenomenaName" } + , { field: 'HBadPhenomenaName', title: '涓嶈壇鐜拌薄', edit: 'text', event: "HBadPhenomenaName", templet: '#HBadPhenomenabtn'} , { field: 'HEmpID', title: '妫�楠屽憳id', hide: true } , { field: 'HCheckMan', title: '妫�楠屽憳', event: "HCheckMan" } , { field: 'HGroupID', title: '鐝粍id', hide: true } diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" index 26316cc..e62ea36 100644 --- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" +++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" @@ -1653,6 +1653,12 @@ if (data.count == 1) { layer.msg(data.Message, { icon: 1 }); $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true); + if (data.Verify == "Y") //鑷姩瀹℃牳 + { + $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID + set_CheckBill(1); //瀹℃牳 + } + layer.close(index); layer.close(index); } else { @@ -1671,6 +1677,34 @@ //#endregion + + //#region 瀹℃牳锛坣um=1锛�/鍙嶅鏍革紙num=2锛� + function set_CheckBill(num) { + $.ajax({ + type: "GET", + url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Check_Json", + async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰 + data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker }, + 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.msg(result.Message, { icon: 2, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, error: function () { + layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + } + //#endregion + //#region 閫�鍑� form.on('submit(btn_Cancel)', function () { layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) { diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechParamReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechParamReport.html" index fefa2bd..18fa76b 100644 --- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechParamReport.html" +++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_TechParamReport.html" @@ -52,6 +52,16 @@ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;"> </div> </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width: 85px;">鐢熶骇璧勬簮</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" value="" style="background-color: #efefef4d; width: 70%; display: inline-block;" readonly> + <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0"> + <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSource" id="btnHSource" style="padding: 0 10px;float: right;margin-right: 3px;"> + <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> + </button> + </div> + </div> <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;"> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">椤圭洰鍙�</label> @@ -90,7 +100,7 @@ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> </div> - + </div> </div> <div> @@ -396,6 +406,7 @@ var HEndDate = $("#HEndDate").val(); var HProject = $("#HProject").val();//椤圭洰鍙� var HProcId = $("#HProcId").val(); //宸ュ簭 + var HSourceID = $("#HSourceID").val(); //鐢熶骇璧勬簮 var Frequency = $("#Frequency").val();//棰戞 @@ -404,7 +415,8 @@ , HEndDate: HEndDate , HProject: HProject , HProcId: HProcId - , Frequency: Frequency + , Frequency: Frequency + , HSourceID:HSourceID } get_Display(JSON.stringify(sWhere)); //鍔犺浇鏌辩姸鍥� @@ -424,6 +436,9 @@ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡 $("#HProject").val(""); $("#HProcId").val("0"); + $("#HProcName").val(""); + $("#HSourceID").val("0"); + $("#HSourceName").val(""); $("#Frequency").val("6"); form.render('select'); @@ -472,6 +487,45 @@ }); }); + + //鐢熶骇璧勬簮 + form.on('submit(btnHSource)', function () { + //椤甸潰灞�-鑷畾涔� + layer.open({ + type: 2, + skin: 'layui-layer-rim', //鍔犱笂杈规 + title: '鐢熶骇璧勬簮鍒楄〃', + closeBtn: 1, + shift: 2, + area: ['90%', '90%'], + maxmin: true, + content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html', 'yes'], + btn: ['纭畾', '鍙栨秷'] + , btn1: function (index, layero) { + + //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 + var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 + var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" + if (checkStatus.data.length === 0) { + return layer.msg('璇烽�夋嫨鏁版嵁'); + } + $("#HSourceName").val(checkStatus.data[0].鐢熶骇璧勬簮鍚嶇О); + $("#HSourceID").val(checkStatus.data[0].HItemID); + layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� + } + , btn2: function (index, layero) { + //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟 + //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴 + }, + end: function () { + + }, + success: function (layero, index) { + + } + }); + }); + //#region 銆愭暎鐐瑰浘銆� function set_Graphics() { var chartDom = document.getElementById('histogram'); diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" index 2b9b830..13d8b4c 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" @@ -1240,7 +1240,7 @@ table.render(option); } var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞� - Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]); + Display_HideButton(set_HideButton_ID, "3791", HModName, sessionStorage["HUserName"]); }, error: function () { layer.alert(get_MessageError("[0000-1-002]鎺ュ彛璇锋眰澶辫触!", sessionStorage["HTranSlate"]), { icon: 5 }); } @@ -2299,7 +2299,8 @@ DisPlay_HideColumn(); var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞� - Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]); + Display_HideButton(set_HideButton_ID, "3791", HModName, sessionStorage["HUserName"]); + layer.close(ajaxLoad); if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") { @@ -2770,18 +2771,22 @@ var HWorkBillNo = $("#HWorkBillNo").val(); var HBillNo = $("#HBillNo").val(); var HProcExchBillNo = $("#HProcExchBillNo").val(); - var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋 - 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 checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋 var HNumber = $("#HNumber").val(); //浜у搧浠g爜 鍗崇墿鏂欑紪鐮� var HName = $("#HName").val(); //褰撳墠宸ュ簭 var HEmpNumber = $("#HEmpNumber").val(); //鎿嶄綔鍛樹唬鐮� var HEmpName = $("#HEmpName").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) { @@ -2803,27 +2808,47 @@ } sWhere += " and " + ColName + " " + com; } - if (ColName1 != 0 && Comparator1 != 0) { - var com = ""; + var com1 = ""; switch (Comparator1) { case "7": - com = "like'%" + ColContent1 + "%'"; + com1 = "like'%" + ColContent1 + "%'"; break; case "8": - com = "like'%" + ColContent1 + "'"; + com1 = "like'%" + ColContent1 + "'"; break; case "9": - com = "like'" + ColContent1 + "%'"; + com1 = "like'" + ColContent1 + "%'"; break; case "10": - com = "not like'%" + ColContent1 + "%'"; + com1 = "not like'%" + ColContent1 + "%'"; break; default: - com = "" + Comparator1 + "'" + ColContent1 + "'"; + com1 = "" + Comparator1 + "'" + ColContent1 + "'"; break; } - sWhere += " and " + ColName1 + " " + com; + 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 (HBeginDate) { @@ -2912,9 +2937,9 @@ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>'; } } - $("#ColName").empty() + $("#ColName").empty(); $("#ColName").append(Organization); - $("#ColName1").empty() + $("#ColName1").empty(); $("#ColName1").append(Organization); $("#ColName2").empty(); $("#ColName2").append(Organization); -- Gitblit v1.9.1