From 2c5edb5a7bd7b36a7d2f94b1d7347dbe1b6b318b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 07 四月 2025 09:46:13 +0800
Subject: [PATCH] 合并
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/报工平台_PDA/产量汇报/Sc_Add_ProductReportBillList_PDA.html | 9
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 34
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedCheckQuery.html | 231 +++----
WebTM/views/生产管理/欠料运算/JIT_MaterialLevelShorAnalysisReport.html | 27
WebTM/views/生产管理/报工平台_PDA/完工/Sc_Add_MESEndWorkBillList_PDA.html | 9
WebTM/views/生产管理/三升排产/JIT_DayPlanPlatForm.html | 8
WebTM/views/项目管理/工程项目/PM_ProjectTaskNeedSaveQuery.html | 744 ++++++++++++++++++++++++
WebTM/views/生产管理/报工平台_PDA/停工/Sc_Add_MESStopWorkBillList_PDA.html | 9
WebTM/views/生产管理/报工平台_PDA/开工/Sc_Add_MESBeginWorkBillList_PDA.html | 22
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 169 +++++
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 486 +++++++++++++--
WebTM/WebTM.csproj | 1
14 files changed, 1,467 insertions(+), 288 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index a17e507..2a244a3 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-02T06:23:15.0843315Z;True|2025-04-02T14:16:43.4291041+08:00;True|2025-04-02T14:15:55.9278785+08:00;True|2025-04-02T14:15:02.0047936+08:00;True|2025-04-02T14:11:21.5012753+08:00;True|2025-04-02T14:03:05.8819962+08:00;True|2025-04-02T11:28:07.3915062+08:00;True|2025-04-02T11:15:34.8627211+08:00;True|2025-04-02T11:06:59.6624455+08:00;True|2025-04-02T11:02:45.3600811+08:00;True|2025-04-02T10:54:20.1665104+08:00;True|2025-04-02T10:53:13.9563242+08:00;False|2025-04-02T10:52:57.6924457+08:00;True|2025-04-01T14:13:01.8004212+08:00;True|2025-04-01T13:32:34.2769883+08:00;True|2025-04-01T13:24:41.1605228+08:00;True|2025-04-01T13:19:53.6891106+08:00;True|2025-04-01T11:17:33.5287490+08:00;False|2025-04-01T11:14:53.9926628+08:00;True|2025-03-31T15:57:11.4216850+08:00;False|2025-03-31T15:56:39.2736743+08:00;True|2025-03-28T09:54:10.2320963+08:00;True|2025-03-28T09:52:56.9147355+08:00;True|2025-03-28T09:31:22.7386913+08:00;True|2025-03-28T08:59:22.0025325+08:00;False|2025-03-28T08:58:48.9811079+08:00;True|2025-03-27T10:51:57.4616529+08:00;False|2025-03-27T10:50:13.5716858+08:00;True|2025-03-26T09:55:04.8016338+08:00;True|2025-03-26T09:47:17.7864255+08:00;True|2025-03-26T09:46:35.8664817+08:00;True|2025-03-26T09:40:24.9918189+08:00;True|2025-03-26T09:37:09.5478150+08:00;True|2025-03-26T09:35:40.0499132+08:00;True|2025-03-20T15:01:40.3595666+08:00;True|2025-03-20T14:55:19.0059522+08:00;True|2025-03-20T14:51:39.8660319+08:00;True|2025-03-20T14:27:56.5777746+08:00;True|2025-03-20T13:39:54.7519574+08:00;True|2025-03-19T09:05:48.0282472+08:00;True|2025-03-17T10:08:13.6442704+08:00;True|2025-03-17T09:38:45.1414063+08:00;False|2025-03-17T09:38:22.1405719+08:00;True|2025-03-14T09:32:40.9681768+08:00;True|2025-03-14T09:16:06.9157363+08:00;True|2025-03-14T09:13:01.1255797+08:00;True|2025-03-14T09:11:11.1674520+08:00;True|2025-03-14T09:08:06.9585979+08:00;False|2025-03-14T09:07:47.0760411+08:00;True|2025-03-13T15:55:41.7744956+08:00;True|2025-03-13T13:00:11.3007903+08:00;False|2025-03-13T12:59:36.8182552+08:00;True|2025-03-12T15:14:27.9947739+08:00;True|2025-03-12T15:03:55.1318390+08:00;True|2025-03-12T14:26:34.0190332+08:00;False|2025-03-12T14:25:59.1193483+08:00;True|2025-03-12T09:22:01.4883764+08:00;False|2025-03-12T09:21:39.0080903+08:00;True|2025-03-10T16:26:58.5018670+08:00;True|2025-03-10T16:24:00.3905172+08:00;True|2025-03-10T16:20:21.6595733+08:00;True|2025-03-10T16:18:07.2171657+08:00;True|2025-03-10T16:17:40.3642488+08:00;True|2025-03-10T15:56:00.8463304+08:00;False|2025-03-10T15:54:09.9161096+08:00;False|2025-03-07T10:17:09.2480344+08:00;True|2025-03-06T13:45:18.6674111+08:00;True|2025-03-06T13:43:45.5631731+08:00;False|2025-03-06T13:43:00.1471219+08:00;True|2025-03-06T10:48:04.2926112+08:00;True|2025-03-06T10:24:43.8490693+08:00;True|2025-03-06T09:51:10.8897698+08:00;True|2025-03-06T09:49:27.7421450+08:00;False|2025-03-06T09:49:03.3732372+08:00;True|2025-03-05T10:21:19.2996243+08:00;True|2025-03-05T10:16:03.8214445+08:00;True|2025-03-05T10:14:08.3530581+08:00;True|2025-03-05T10:12:43.5189214+08:00;True|2025-03-05T10:11:16.9120956+08:00;True|2025-03-05T10:05:48.7400931+08:00;False|2025-03-05T10:04:45.2322677+08:00;True|2025-03-04T13:33:54.2471288+08:00;True|2025-03-04T13:23:41.1767740+08:00;True|2025-03-04T11:28:16.4264524+08:00;True|2025-03-04T11:27:03.1611137+08:00;False|2025-03-04T11:26:20.1722430+08:00;True|2025-03-03T15:51:25.3111486+08:00;True|2025-03-03T15:49:32.9940710+08:00;True|2025-03-03T15:46:47.8394406+08:00;True|2025-03-03T15:44:08.2556647+08:00;True|2025-03-03T15:33:18.9879890+08:00;True|2025-03-03T15:31:24.7555763+08:00;True|2025-03-03T15:28:22.2926603+08:00;True|2025-03-03T15:27:18.8298542+08:00;True|2025-03-03T15:24:59.7379802+08:00;True|2025-03-03T15:23:34.0850359+08:00;True|2025-03-03T15:12:24.7076928+08:00;True|2025-03-03T15:04:52.9486877+08:00;True|2025-03-03T14:52:08.1750244+08:00;True|2025-03-03T14:50:55.1357809+08:00;True|2025-03-03T14:03:38.1176734+08:00;True|2023-10-12T09:41:32.8016639+08:00;True|2023-10-12T09:33:45.7062293+08:00;True|2023-10-12T09:25:29.1606626+08:00;True|2023-10-12T09:14:56.8301672+08:00;True|2023-10-12T08:49:06.9528588+08:00;True|2023-10-12T08:41:10.4198328+08:00;True|2023-10-12T08:18:17.0155897+08:00;True|2023-10-11T16:54:34.3349896+08:00;True|2023-10-11T09:31:56.5412983+08:00;True|2023-10-11T09:22:34.8025065+08:00;True|2023-10-10T09:16:33.9279356+08:00;True|2023-10-10T08:57:14.5748323+08:00;True|2023-10-09T09:53:51.8108832+08:00;True|2023-10-08T08:23:15.3020047+08:00;True|2023-10-07T09:41:46.6477464+08:00;True|2023-09-28T13:09:37.4726020+08:00;True|2023-09-28T10:25:25.5533941+08:00;True|2023-09-28T09:22:53.9752101+08:00;True|2023-09-27T09:09:26.8663364+08:00;True|2023-09-26T08:16:45.5815324+08:00;True|2023-09-25T16:06:51.3059542+08:00;False|2023-09-25T16:04:20.0823603+08:00;False|2023-09-25T16:02:50.2444755+08:00;False|2023-09-25T15:57:25.3025439+08:00;False|2023-09-25T15:56:49.6970018+08:00;False|2023-09-25T15:53:20.4815252+08:00;False|2023-09-25T15:50:19.8534089+08:00;True|2023-09-25T13:10:42.3669273+08:00;True|2021-09-27T16:24:34.0556986+08:00;True|2021-07-23T15:55:16.4166192+08:00;True|2021-07-23T15:55:10.5231272+08:00;True|2021-07-23T15:42:16.1730479+08:00;True|2021-07-23T13:59:03.2163357+08:00;True|2021-07-23T13:56:27.0248090+08:00;True|2021-07-23T13:50:06.6730828+08:00;True|2021-07-23T13:16:54.0609171+08:00;True|2021-07-23T09:47:26.2349449+08:00;True|2021-06-18T10:08:36.7720289+08:00;True|2021-06-18T10:02:02.8556313+08:00;True|2021-06-18T09:19:46.8101433+08:00;True|2021-06-17T11:28:10.2122132+08:00;True|2021-06-15T15:34:03.2312661+08:00;True|2021-06-15T15:15:22.7546719+08:00;True|2021-06-15T13:29:38.8451270+08:00;True|2021-06-15T13:24:00.8964134+08:00;True|2021-06-15T12:58:20.3927060+08:00;True|2021-06-15T12:23:25.0159432+08:00;True|2021-06-15T12:22:38.0563281+08:00;True|2021-06-15T11:28:19.6194535+08:00;True|2021-06-15T11:25:48.8728949+08:00;True|2021-06-15T11:09:38.1544762+08:00;True|2021-06-15T10:41:56.9826851+08:00;True|2021-06-15T10:35:25.0388391+08:00;True|2021-06-15T10:32:29.6233619+08:00;True|2021-06-15T09:23:13.5958671+08:00;True|2021-06-15T09:06:29.5417195+08:00;True|2021-06-15T08:37:15.2838896+08:00;True|2021-06-10T17:14:07.3138711+08:00;True|2021-06-10T17:01:12.2987318+08:00;True|2021-06-10T16:59:40.3348009+08:00;True|2021-06-10T16:46:10.5921685+08:00;True|2021-06-10T16:44:16.2724973+08:00;True|2021-06-10T14:39:02.6527482+08:00;True|2021-06-10T14:29:40.7812962+08:00;True|2021-06-10T14:25:39.2821282+08:00;True|2021-06-10T12:14:41.9132607+08:00;True|2021-06-09T18:13:34.0547788+08:00;True|2021-06-09T18:09:50.1762278+08:00;True|2021-06-09T18:00:21.8790266+08:00;True|2021-06-09T17:56:33.9442691+08:00;True|2021-06-09T14:04:32.7497044+08:00;True|2021-06-09T14:03:24.6380146+08:00;True|2021-06-09T14:01:43.0362725+08:00;True|2021-06-09T13:55:02.5402435+08:00;True|2021-06-09T13:52:40.0249905+08:00;True|2021-06-09T13:49:51.5385793+08:00;True|2021-06-09T13:49:17.1969762+08:00;True|2021-06-09T13:41:45.8438377+08:00;True|2021-06-09T13:36:33.2456459+08:00;True|2021-06-09T13:30:16.9451132+08:00;True|2021-06-09T13:17:58.5879548+08:00;True|2021-06-09T13:16:57.3408341+08:00;True|2021-06-09T13:15:05.8138183+08:00;True|2021-06-09T13:12:15.5302490+08:00;True|2021-06-09T13:10:47.8201239+08:00;True|2021-06-09T13:08:07.4256926+08:00;True|2021-06-09T13:00:02.7890031+08:00;True|2021-06-09T12:24:40.5779581+08:00;True|2021-06-09T11:37:09.7069564+08:00;True|2021-06-09T11:31:04.1006833+08:00;True|2021-06-09T09:55:08.3057126+08:00;True|2021-06-08T19:53:15.6886046+08:00;True|2021-06-08T19:20:42.7329855+08:00;True|2021-06-08T19:14:50.6279399+08:00;True|2021-06-08T19:13:38.2606918+08:00;True|2021-06-08T19:09:02.6131247+08:00;True|2021-06-08T15:26:29.1177990+08:00;True|2021-06-08T15:19:58.5398363+08:00;True|2021-06-08T15:17:22.9886891+08:00;True|2021-06-08T15:12:14.6339838+08:00;True|2021-06-08T14:51:00.8799652+08:00;True|2021-06-08T14:05:12.6659322+08:00;True|2021-06-08T13:43:40.9520061+08:00;True|2021-06-08T10:17:41.3958040+08:00;True|2021-06-08T10:15:02.9531430+08:00;True|2021-06-08T10:13:41.2052893+08:00;True|2021-06-08T10:03:42.7732330+08:00;True|2021-06-08T09:19:05.6925809+08:00;True|2021-06-08T09:16:51.2551694+08:00;True|2021-06-08T08:55:47.9089196+08:00;True|2021-06-08T08:54:17.8644326+08:00;True|2021-06-08T08:45:54.0145422+08:00;True|2021-06-08T08:44:04.2569950+08:00;True|2021-06-08T00:06:04.7376137+08:00;True|2021-06-08T00:04:38.0773596+08:00;True|2021-06-07T23:49:53.8045627+08:00;True|2021-06-07T23:22:13.3541265+08:00;True|2021-06-07T22:50:52.5159395+08:00;True|2021-06-07T22:45:07.1078061+08:00;True|2021-06-07T22:31:11.8021180+08:00;True|2021-06-07T22:28:59.6668746+08:00;True|2021-06-07T22:22:40.9337623+08:00;True|2021-06-07T17:47:23.5505559+08:00;True|2021-06-07T17:45:13.5831540+08:00;True|2021-06-05T07:11:01.7763083+08:00;True|2021-06-05T07:09:05.1958272+08:00;True|2021-06-05T07:07:49.7067173+08:00;True|2021-06-05T06:55:07.6636653+08:00;True|2021-06-05T06:53:43.3503529+08:00;True|2021-06-05T06:51:22.0905015+08:00;True|2021-06-05T06:49:55.7672067+08:00;True|2021-06-05T05:53:58.0861418+08:00;True|2021-06-05T05:50:07.2096908+08:00;True|2021-06-05T05:47:01.4240794+08:00;True|2021-06-05T05:44:46.6184627+08:00;True|2021-06-04T17:23:59.1828660+08:00;True|2021-06-04T17:12:55.1640467+08:00;True|2021-06-04T17:10:45.5488523+08:00;True|2021-06-04T17:00:56.3672787+08:00;True|2021-06-04T16:06:36.6880762+08:00;True|2021-06-04T16:03:40.4888248+08:00;True|2021-06-04T15:57:12.2559775+08:00;True|2021-06-04T15:53:18.4937427+08:00;True|2021-06-04T15:47:03.6428056+08:00;True|2021-06-04T14:00:15.5079491+08:00;True|2021-06-04T13:39:24.2724835+08:00;True|2021-06-04T10:36:24.7725284+08:00;True|2021-06-04T09:55:58.5820875+08:00;True|2021-06-04T09:54:31.8417288+08:00;True|2021-06-04T09:49:30.1299352+08:00;True|2021-06-02T01:13:35.0933908+08:00;True|2021-06-02T00:41:42.6942384+08:00;True|2021-06-02T00:34:16.2857357+08:00;True|2021-06-02T00:30:24.3715291+08:00;True|2021-06-02T00:28:05.7622093+08:00;True|2021-06-01T23:47:07.9812981+08:00;True|2021-06-01T23:43:54.6399997+08:00;True|2021-06-01T23:26:11.7387178+08:00;True|2021-06-01T23:24:01.7848138+08:00;True|2021-06-01T23:17:44.1499458+08:00;True|2021-06-01T22:53:53.2119388+08:00;True|2021-06-01T21:41:10.2077522+08:00;True|2021-06-01T18:20:43.2169444+08:00;True|2021-06-01T17:43:22.5732122+08:00;True|2021-06-01T17:42:17.2436639+08:00;True|2021-06-01T17:38:17.4943310+08:00;True|2021-06-01T17:36:57.0238586+08:00;True|2021-06-01T17:30:37.3487475+08:00;True|2021-06-01T17:27:02.9990906+08:00;True|2021-06-01T17:12:53.0479797+08:00;True|2021-06-01T17:12:09.3355906+08:00;True|2021-06-01T17:00:12.7270464+08:00;True|2021-06-01T16:59:01.8148500+08:00;True|2021-06-01T16:58:24.2363761+08:00;True|2021-06-01T16:55:09.7112426+08:00;True|2021-06-01T16:49:52.5036858+08:00;True|2021-06-01T16:46:54.0104279+08:00;True|2021-06-01T16:45:15.4974503+08:00;True|2021-06-01T16:43:27.9970309+08:00;True|2021-06-01T16:41:38.1709833+08:00;True|2021-06-01T16:35:26.5280595+08:00;True|2021-06-01T16:33:57.1397727+08:00;True|2021-06-01T16:32:06.3944162+08:00;True|2021-06-01T16:25:01.1116292+08:00;True|2021-06-01T16:18:36.2515412+08:00;True|2021-06-01T16:13:19.6237694+08:00;True|2021-06-01T16:10:58.1070245+08:00;True|2021-06-01T16:09:36.9385489+08:00;True|2021-06-01T16:08:12.6387651+08:00;True|2021-06-01T15:56:56.8265580+08:00;True|2021-06-01T15:55:24.4764864+08:00;True|2021-06-01T15:52:55.2991115+08:00;True|2021-06-01T15:42:11.4675544+08:00;True|2021-06-01T15:37:23.2605867+08:00;True|2021-06-01T15:36:07.1708859+08:00;True|2021-06-01T15:27:13.7607576+08:00;True|2021-06-01T15:26:02.1216167+08:00;True|2021-06-01T15:20:17.9785316+08:00;True|2021-06-01T15:17:31.7994535+08:00;True|2021-06-01T15:15:33.5870547+08:00;True|2021-06-01T14:48:48.5199499+08:00;True|2021-06-01T14:47:20.2642947+08:00;True|2021-06-01T14:35:18.9806312+08:00;True|2021-06-01T14:33:16.4926476+08:00;True|2021-06-01T14:09:52.1874112+08:00;True|2021-06-01T14:05:13.8582579+08:00;True|2021-06-01T14:00:48.2904877+08:00;True|2021-06-01T13:59:23.3066213+08:00;True|2021-06-01T13:56:48.0600266+08:00;True|2021-06-01T13:34:54.6842175+08:00;True|2021-06-01T13:25:18.0545294+08:00;True|2021-06-01T13:21:54.5203762+08:00;True|2021-06-01T13:16:21.1912230+08:00;True|2021-06-01T13:15:48.6019094+08:00;True|2021-06-01T13:15:01.6891992+08:00;True|2021-06-01T13:05:12.8050109+08:00;True|2021-06-01T12:56:50.4159001+08:00;True|2021-06-01T12:55:03.9062599+08:00;True|2021-06-01T12:50:27.5401681+08:00;True|2021-06-01T12:49:25.1885018+08:00;True|2021-06-01T12:47:37.2860892+08:00;True|2021-06-01T12:44:42.0069652+08:00;True|2021-06-01T12:41:06.6339839+08:00;True|2021-06-01T12:20:08.2825333+08:00;True|2021-06-01T12:17:54.3212651+08:00;True|2021-06-01T12:14:59.7872609+08:00;True|2021-06-01T12:13:59.8766709+08:00;True|2021-06-01T11:22:13.6818824+08:00;True|2021-06-01T11:11:11.8712602+08:00;True|2021-06-01T11:10:20.1735009+08:00;True|2021-06-01T11:08:17.1112299+08:00;True|2021-06-01T11:05:17.8698240+08:00;True|2021-06-01T10:44:43.4614150+08:00;True|2021-05-31T19:20:49.8593267+08:00;True|2021-05-31T19:19:26.2940461+08:00;True|2021-05-31T19:17:45.6039999+08:00;True|2021-05-31T19:08:59.0966761+08:00;True|2021-05-31T19:08:10.5596672+08:00;True|2021-05-31T19:06:39.0670555+08:00;True|2021-05-31T19:05:17.3676884+08:00;True|2021-05-31T19:02:32.1409470+08:00;True|2021-05-31T18:56:41.4179639+08:00;True|2021-05-31T18:42:20.2441083+08:00;True|2021-05-31T18:37:26.4114464+08:00;True|2021-05-31T18:23:19.4103344+08:00;True|2021-05-31T18:12:52.1436524+08:00;True|2021-05-31T18:09:51.8002595+08:00;True|2021-05-31T18:05:27.5639577+08:00;True|2021-05-31T18:03:35.9346540+08:00;True|2021-05-31T17:58:54.0393109+08:00;True|2021-05-31T17:55:12.5626152+08:00;True|2021-05-31T17:51:03.1966945+08:00;True|2021-05-31T17:49:19.8399729+08:00;True|2021-05-31T17:48:09.7657525+08:00;True|2021-05-31T17:46:21.2958557+08:00;True|2021-05-31T17:29:36.1284253+08:00;True|2021-05-31T17:25:21.8909234+08:00;True|2021-05-31T16:51:39.2706342+08:00;True|2021-05-31T16:49:33.0180809+08:00;True|2021-05-31T16:47:28.9366837+08:00;True|2021-05-31T16:45:54.1110876+08:00;True|2021-05-31T16:06:11.0032865+08:00;True|2021-05-31T16:03:11.8484779+08:00;True|2021-05-31T15:58:52.4728351+08:00;True|2021-05-31T15:52:41.3707489+08:00;True|2021-05-31T15:50:22.0767930+08:00;True|2021-05-31T14:55:08.8676668+08:00;True|2021-05-31T14:52:44.0538893+08:00;True|2021-05-31T13:58:49.2018041+08:00;True|2021-05-31T13:54:55.2565438+08:00;True|2021-05-31T13:51:07.8012368+08:00;True|2021-05-31T13:42:17.1041462+08:00;True|2021-05-31T13:41:18.8074005+08:00;True|2021-05-31T13:40:07.2910452+08:00;True|2021-05-31T13:33:41.8814879+08:00;True|2021-05-31T13:23:36.5532446+08:00;True|2021-05-31T13:21:56.2476049+08:00;True|2021-05-31T13:17:18.5030541+08:00;True|2021-05-31T13:15:40.9653645+08:00;True|2021-05-31T13:05:02.0114383+08:00;True|2021-05-31T13:03:31.1860836+08:00;True|2021-05-31T12:50:06.1218714+08:00;True|2021-05-31T10:37:20.3332108+08:00;True|2021-05-28T15:09:56.1970299+08:00;True|2021-05-28T14:25:51.6645627+08:00;True|2021-05-28T13:57:27.0842735+08:00;True|2021-05-28T09:43:20.1440634+08:00;True|2021-05-28T09:18:20.6994283+08:00;True|2021-05-27T17:48:05.1485157+08:00;True|2021-05-27T14:12:24.8809260+08:00;True|2021-05-27T13:55:41.4584398+08:00;True|2021-05-27T13:38:04.4939557+08:00;True|2021-05-25T17:58:59.4925936+08:00;True|2021-05-25T17:34:39.0766301+08:00;True|2021-05-25T16:52:27.5836825+08:00;True|2021-05-25T16:17:11.2915197+08:00;True|2021-05-25T15:56:40.9073807+08:00;True|2021-05-25T15:55:13.6625654+08:00;True|2021-05-25T14:19:47.6594488+08:00;True|2021-05-25T13:29:54.4902763+08:00;True|2021-05-25T10:07:46.4913499+08:00;True|2021-05-25T10:07:00.5180012+08:00;True|2021-05-25T10:03:19.5172048+08:00;True|2021-05-25T10:03:14.0017887+08:00;True|2021-05-25T09:56:45.2214181+08:00;True|2021-05-25T09:40:44.7928610+08:00;True|2021-05-25T09:39:54.9824104+08:00;True|2021-05-21T15:22:12.2171707+08:00;True|2021-05-21T15:19:42.7333615+08:00;True|2021-05-21T11:29:58.3974818+08:00;True|2021-05-21T11:28:09.4616811+08:00;True|2021-05-21T10:47:41.8471117+08:00;True|2021-05-21T10:22:07.2445648+08:00;True|2021-05-21T10:17:03.7723841+08:00;True|2021-05-20T19:16:06.9191828+08:00;True|2021-05-20T15:55:05.5871601+08:00;True|2021-05-20T14:29:30.2254277+08:00;True|2021-05-20T14:25:34.5236240+08:00;True|2021-05-20T14:20:39.0358706+08:00;True|2021-05-20T13:48:02.9388392+08:00;True|2021-05-20T13:39:47.1587014+08:00;True|2021-05-20T13:31:23.4635763+08:00;True|2021-05-20T10:45:56.3395800+08:00;True|2021-05-20T10:40:02.3046411+08:00;True|2021-05-20T08:58:30.2138098+08:00;True|2021-05-19T17:30:07.9866409+08:00;True|2021-05-19T16:35:53.3131106+08:00;True|2021-05-19T15:31:29.5405517+08:00;True|2021-05-19T10:47:11.4381053+08:00;True|2021-05-18T15:34:44.5123556+08:00;True|2021-05-18T15:33:45.3281373+08:00;True|2021-05-18T13:36:24.3027108+08:00;True|2021-05-18T10:30:46.9715813+08:00;True|2021-05-17T16:30:52.0536279+08:00;True|2021-05-17T16:25:48.5246048+08:00;True|2021-05-17T16:23:09.2504235+08:00;True|2021-05-17T16:20:08.1040765+08:00;True|2021-05-17T16:18:13.0021838+08:00;True|2021-05-17T15:49:53.5154178+08:00;True|2021-05-17T15:20:53.2553451+08:00;True|2021-05-17T13:22:30.1785650+08:00;True|2021-05-12T09:19:40.6104101+08:00;True|2021-05-12T08:51:31.1903832+08:00;True|2021-05-11T17:54:23.2917461+08:00;True|2021-05-11T17:41:51.8743268+08:00;True|2021-05-11T15:35:42.7284799+08:00;True|2021-05-11T15:21:56.5628091+08:00;True|2021-05-10T16:46:03.1180467+08:00;True|2021-05-10T16:15:39.9956955+08:00;True|2021-05-08T19:06:57.2743132+08:00;True|2021-05-08T19:05:29.1103688+08:00;True|2021-05-08T19:04:19.9539329+08:00;True|2021-05-08T18:01:38.7928100+08:00;True|2021-05-08T17:52:29.7429021+08:00;True|2021-05-08T17:48:25.9203761+08:00;True|2021-05-08T17:47:15.0602917+08:00;True|2021-05-08T17:43:27.4889222+08:00;True|2021-05-08T17:39:59.4612336+08:00;True|2021-05-08T17:39:33.4978946+08:00;True|2021-05-08T17:39:29.0267002+08:00;True|2021-05-08T17:37:47.5853967+08:00;True|2021-05-08T15:29:49.3055657+08:00;True|2021-05-08T15:27:07.7824934+08:00;True|2021-05-08T14:52:00.4322071+08:00;True|2021-05-08T14:30:25.4769844+08:00;True|2021-05-08T14:20:25.2085810+08:00;True|2021-05-08T13:22:50.6523779+08:00;True|2021-05-08T13:22:45.2166230+08:00;True|2021-05-08T10:18:30.8161572+08:00;True|2021-05-07T20:22:41.7365405+08:00;True|2021-05-07T20:20:31.3610753+08:00;True|2021-05-07T20:20:19.7448959+08:00;True|2021-05-07T20:03:14.9285946+08:00;True|2021-05-07T09:04:49.9965754+08:00;True|2021-05-06T18:08:51.9761525+08:00;True|2021-05-06T17:25:04.5129323+08:00;True|2021-05-06T17:18:48.0130806+08:00;True|2021-05-06T16:27:20.4296013+08:00;True|2021-05-06T16:21:58.2678114+08:00;True|2021-05-06T16:19:59.7383975+08:00;True|2021-05-06T16:17:38.0581420+08:00;True|2021-05-06T16:13:32.0399307+08:00;True|2021-05-06T16:12:43.4430581+08:00;True|2021-05-06T15:03:01.2067903+08:00;True|2021-05-06T15:00:38.4937170+08:00;True|2021-05-06T15:00:20.9792819+08:00;True|2021-05-06T14:47:13.8375625+08:00;True|2021-05-06T14:47:08.2656998+08:00;True|2021-05-06T14:31:31.6193969+08:00;True|2021-05-06T14:30:30.7221216+08:00;True|2021-05-06T14:29:07.9915201+08:00;True|2021-05-06T10:03:10.3335348+08:00;True|2021-04-28T10:26:58.1316805+08:00;True|2021-04-27T16:36:16.4269210+08:00;True|2021-04-27T16:24:41.5059209+08:00;True|2021-04-27T15:53:32.5901894+08:00;True|2021-04-27T15:22:47.3758568+08:00;True|2021-04-27T15:20:08.3268603+08:00;True|2021-04-27T15:07:44.8758565+08:00;True|2021-04-27T14:55:25.1708246+08:00;True|2021-04-27T11:29:16.9305170+08:00;True|2021-04-27T11:22:59.6375169+08:00;True|2021-04-27T11:18:40.6175151+08:00;True|2021-04-27T11:11:03.1485102+08:00;True|2021-04-27T10:59:43.1454752+08:00;True|2021-04-27T10:52:14.9373756+08:00;True|2021-04-26T16:06:17.8889031+08:00;True|2021-04-26T16:01:07.5729037+08:00;True|2021-04-26T15:43:13.1943879+08:00;True|2021-04-26T15:40:31.4783881+08:00;True|2021-04-26T13:48:32.1338637+08:00;True|2021-04-26T13:41:20.7638645+08:00;True|2021-04-26T13:36:41.2688664+08:00;True|2021-04-16T08:22:27.9458518+08:00;True|2021-04-15T16:59:13.8465752+08:00;True|2021-04-15T15:35:34.3385670+08:00;True|2021-04-15T14:45:34.4613245+08:00;True|2021-04-15T14:41:37.0870016+08:00;True|2021-04-15T14:37:07.0200028+08:00;True|2021-04-13T16:40:55.8205619+08:00;True|2021-04-13T16:17:05.5478494+08:00;</History>
+ <History>True|2025-04-02T01:26:02.4368275Z;True|2025-04-02T08:41:02.4825311+08:00;False|2025-04-02T08:40:37.5478841+08:00;True|2025-04-01T14:13:01.8004212+08:00;True|2025-04-01T13:32:34.2769883+08:00;True|2025-04-01T13:24:41.1605228+08:00;True|2025-04-01T13:19:53.6891106+08:00;True|2025-04-01T11:17:33.5287490+08:00;False|2025-04-01T11:14:53.9926628+08:00;True|2025-03-31T15:57:11.4216850+08:00;False|2025-03-31T15:56:39.2736743+08:00;True|2025-03-28T09:54:10.2320963+08:00;True|2025-03-28T09:52:56.9147355+08:00;True|2025-03-28T09:31:22.7386913+08:00;True|2025-03-28T08:59:22.0025325+08:00;False|2025-03-28T08:58:48.9811079+08:00;True|2025-03-27T10:51:57.4616529+08:00;False|2025-03-27T10:50:13.5716858+08:00;True|2025-03-26T09:55:04.8016338+08:00;True|2025-03-26T09:47:17.7864255+08:00;True|2025-03-26T09:46:35.8664817+08:00;True|2025-03-26T09:40:24.9918189+08:00;True|2025-03-26T09:37:09.5478150+08:00;True|2025-03-26T09:35:40.0499132+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/02/2025 15:12:33</publishTime>
+ <publishTime>04/02/2025 15:48:35</publishTime>
</File>
<File Include="bin/WebTM.pdb">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>04/02/2025 15:12:33</publishTime>
+ <publishTime>04/02/2025 15:48:35</publishTime>
</File>
<File Include="HtmlPage1.html">
<publishTime>04/14/2022 09:27:18</publishTime>
@@ -1217,7 +1217,7 @@
<publishTime>08/25/2023 10:07:51</publishTime>
</File>
<File Include="layuiadmin/SetColumn.js">
- <publishTime>04/02/2025 10:00:10</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="layuiadmin/soulTable.slim.js">
<publishTime>09/05/2022 15:38:48</publishTime>
@@ -5396,7 +5396,7 @@
<publishTime>03/25/2024 13:13:32</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓夊崌鎺掍骇/JIT_DayPlanPlatForm.html">
- <publishTime>04/02/2025 10:00:10</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/涓婃枡鍗�/Sc_MaterToSourceBillList.html">
<publishTime>05/25/2021 21:09:20</publishTime>
@@ -5657,10 +5657,10 @@
<publishTime>03/18/2025 08:57:02</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisDetailReport.html">
- <publishTime>04/02/2025 10:00:10</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/娆犳枡杩愮畻/JIT_MaterialLevelShorAnalysisReport.html">
- <publishTime>04/02/2025 10:00:10</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐝寮�鐝崟/Sc_ShiftsBeginInfoBillList.html">
<publishTime>04/02/2025 10:00:10</publishTime>
@@ -5840,7 +5840,7 @@
<publishTime>03/13/2025 13:40:42</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html">
- <publishTime>04/02/2025 10:00:10</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm_BCP.html">
<publishTime>06/11/2024 23:45:48</publishTime>
@@ -7543,7 +7543,7 @@
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
<publishTime>04/16/2021 10:32:11</publishTime>
<publishTime>04/16/2021 10:32:11</publishTime>
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillQuery.html">
<publishTime>02/28/2025 15:34:02</publishTime>
@@ -7877,10 +7877,10 @@
<publishTime>07/11/2024 13:03:13</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html">
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 16:20:10</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html">
- <publishTime>01/21/2025 09:36:44</publishTime>
+ <publishTime>04/02/2025 10:25:23</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectEndBillMain.html">
<publishTime>05/13/2024 10:39:38</publishTime>
@@ -7901,7 +7901,7 @@
<publishTime>06/06/2024 15:19:31</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectTaskNeedCheckQuery.html">
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_WorkPlanMonthBillMain.html">
<publishTime>04/02/2024 15:31:56</publishTime>
@@ -7913,7 +7913,7 @@
<publishTime>02/26/2024 14:55:33</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鎶ヨ〃鍒嗘瀽/PM_ProjectRepairTaskExamMoneyReport.html">
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 09:28:05</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鎶ヨ〃鍒嗘瀽/PM_ProjectRepairTaskOtherMoneyReport.html">
<publishTime>04/02/2025 10:00:11</publishTime>
@@ -7922,7 +7922,7 @@
<publishTime>04/02/2025 10:00:11</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鎶ヨ〃鍒嗘瀽/PM_ProjectRepairTaskSumReport.html">
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 08:25:08</publishTime>
</File>
<File Include="views/椤圭洰绠＄悊/鎶ヨ〃鍒嗘瀽/PM_ProjectWorkDaysEntryReport.html">
<publishTime>09/14/2023 09:32:08</publishTime>
@@ -8081,7 +8081,7 @@
<publishTime>03/06/2023 09:10:32</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill.html">
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
<publishTime>04/14/2021 13:43:50</publishTime>
@@ -8263,7 +8263,7 @@
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
<publishTime>04/15/2021 16:31:28</publishTime>
<publishTime>04/15/2021 16:31:28</publishTime>
- <publishTime>04/02/2025 10:00:11</publishTime>
+ <publishTime>04/02/2025 08:36:49</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillListQuery.html">
<publishTime>12/12/2024 11:30:31</publishTime>
@@ -8322,7 +8322,7 @@
</File>
<File Include="Web.config">
<publishTime>04/27/2021 20:31:08</publishTime>
- <publishTime>04/02/2025 10:53:04</publishTime>
+ <publishTime>04/02/2025 15:48:36</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 1de955d..19d0ba4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -2260,6 +2260,7 @@
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedSaveQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedCheckQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index a34dd6f..980f848 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 160d9dc..e9b3512 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -10,8 +10,8 @@
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- //var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
index ea14499..59d0c8d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\270\211\345\215\207\346\216\222\344\272\247/JIT_DayPlanPlatForm.html"
@@ -74,12 +74,12 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">棰勭暀鏁伴噺</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">閿佸畾澶╂暟</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -96,7 +96,7 @@
</select>
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">榻愬绫诲瀷</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
<select name="HOrderType" id="HOrderType" lay-verify="HOrderType">
@@ -104,7 +104,7 @@
<option value="鏍囧噯Bom">鏍囧噯Bom</option>
</select>
</div>
- </div>
+ </div>-->
</div>
<!--<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportBillList_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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportBillList_PDA.html"
index a8c5fd8..2851866 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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportBillList_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/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportBillList_PDA.html"
@@ -453,7 +453,7 @@
if (result.count == 1) {
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
$("#HInterID").val(result.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function (index) {
if (result.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
@@ -608,15 +608,12 @@
//閫�鍑�--鍏ㄥ睆鐗�
form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html";
- });
+ Pub_Close2(1);
})
//鏂板
form.on('submit(Add)', function () {
- var index = parent.layer.getFrameIndex(window.name); // 鍏堝緱鍒板綋鍓� iframe 灞傜殑绱㈠紩
- parent.layer.close(index); // 鍐嶆墽琛屽叧闂�
+ Pub_Close2(1);
})
//#endregion
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/\345\201\234\345\267\245/Sc_Add_MESStopWorkBillList_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/\345\201\234\345\267\245/Sc_Add_MESStopWorkBillList_PDA.html"
index 5951176..09cadd3 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/\345\201\234\345\267\245/Sc_Add_MESStopWorkBillList_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/\345\201\234\345\267\245/Sc_Add_MESStopWorkBillList_PDA.html"
@@ -471,7 +471,7 @@
if (result.count == 1) {
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
$("#HInterID").val(result.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function (index) {
if (result.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
@@ -626,15 +626,12 @@
//閫�鍑�--鍏ㄥ睆鐗�
form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html";
- });
+ Pub_Close2(1);
})
//鏂板
form.on('submit(Add)', function () {
- var index = parent.layer.getFrameIndex(window.name); // 鍏堝緱鍒板綋鍓� iframe 灞傜殑绱㈠紩
- parent.layer.close(index); // 鍐嶆墽琛屽叧闂�
+ Pub_Close2(1);
})
//#endregion
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/\345\256\214\345\267\245/Sc_Add_MESEndWorkBillList_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/\345\256\214\345\267\245/Sc_Add_MESEndWorkBillList_PDA.html"
index 20ebe4c..04c0527 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/\345\256\214\345\267\245/Sc_Add_MESEndWorkBillList_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/\345\256\214\345\267\245/Sc_Add_MESEndWorkBillList_PDA.html"
@@ -413,7 +413,7 @@
if (result.count == 1) {
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
$("#HInterID").val(result.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function (index) {
if (result.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
@@ -568,15 +568,12 @@
//閫�鍑�--鍏ㄥ睆鐗�
form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html";
- });
+ Pub_Close2(1);
})
//鏂板
form.on('submit(Add)', function () {
- var index = parent.layer.getFrameIndex(window.name); // 鍏堝緱鍒板綋鍓� iframe 灞傜殑绱㈠紩
- parent.layer.close(index); // 鍐嶆墽琛屽叧闂�
+ Pub_Close2(1);
})
//#endregion
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/\345\274\200\345\267\245/Sc_Add_MESBeginWorkBillList_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/\345\274\200\345\267\245/Sc_Add_MESBeginWorkBillList_PDA.html"
index 7aaa6b3..1d18d66 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/\345\274\200\345\267\245/Sc_Add_MESBeginWorkBillList_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/\345\274\200\345\267\245/Sc_Add_MESBeginWorkBillList_PDA.html"
@@ -359,14 +359,6 @@
});
//#endregion
-
- //#region 鏂板鎸夐挳
- form.on('submit(Add)', function () {//鎻愪氦
- layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- location.replace('Sc_MESBeginWorkBillList_PDA.html?type=' + params[params[0]]);
- });
- })
- //#endregion
//#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {//鎻愪氦
@@ -413,7 +405,7 @@
if (result.count == 1) {
$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//绂佺敤淇濆瓨鎸夐挳
$("#HInterID").val(result.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
- layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function (index) {
if (result.Verify == "Y") //鑷姩瀹℃牳
{
layer.close(index);
@@ -568,15 +560,17 @@
//閫�鍑�--鍏ㄥ睆鐗�
form.on('submit(Cancel)', function () {
- layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
- parent.location.href = "../../../../views/index_Mobile.html";
- });
+ //layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+ // parent.location.href = "../../../../views/index_Mobile.html";
+ //});
+ Pub_Close2(1);
})
//鏂板
form.on('submit(Add)', function () {
- var index = parent.layer.getFrameIndex(window.name); // 鍏堝緱鍒板綋鍓� iframe 灞傜殑绱㈠紩
- parent.layer.close(index); // 鍐嶆墽琛屽叧闂�
+ //var index = parent.layer.getFrameIndex(window.name); // 鍏堝緱鍒板綋鍓� iframe 灞傜殑绱㈠紩
+ //parent.layer.close(index); // 鍐嶆墽琛屽叧闂�
+ Pub_Close2(1);
})
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
index 79909c4..3dd39d9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\254\240\346\226\231\350\277\220\347\256\227/JIT_MaterialLevelShorAnalysisReport.html"
@@ -263,8 +263,8 @@
})
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date().setDate(new Date().getDate() - 30), "yyyy-MM-dd"));//娆犳枡鏃ユ湡
+ $("#HENDDATE").val(Format(new Date().setDate(new Date().getDate() + 30), "yyyy-MM-dd"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
//杞﹂棿
@@ -356,6 +356,14 @@
, cols: [columns]
, done: function (res, curr, count) {
soulTable.render(this);
+ for (var i in res.data) {
+ var item = res.data[i];
+
+ if (item["鏈尮閰嶈鍗曟暟閲�"] > 0) {
+ $("tr[data-index='" + i + "']").attr({ "style": "background:red;color:black;" });
+ }
+
+ }
}
};
}
@@ -449,11 +457,18 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
- } else if (data[i].name == '鏄惁鍖归厤鍒拌鍗�') {
- col.push({ field: '鏄惁鍖归厤鍒拌鍗�', title: '鏄惁鍖归厤鍒拌鍗�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鍗� ? '鍚�' : '鏄�'; } });
+ } else if (data[i].name == '鏈尮閰嶈鍗曟暟閲�') {
+ col.push({
+ field: '鏈尮閰嶈鍗曟暟閲�', title: '鏈尮閰嶈鍗曟暟閲�', sort: true, filter: true, templet: function (d) {
+ return d.鏈尮閰嶈鍗曟暟閲� > 0 ? '<span style="color: red;">' + d.鏈尮閰嶈鍗曟暟閲� + '</span>' : d.鏈尮閰嶈鍗曟暟閲�;
+ } });
}
- else if (data[i].name == '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�') {
- col.push({ field: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', title: '鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭�', sort: true, filter: true, templet: function (d) { return d.鏄惁鍖归厤鍒拌鏂欒鍒掍俊鎭� ? '鍚�' : '鏄�'; } });
+ else if (data[i].name == '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�') {
+ col.push({
+ field: '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�', title: '鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�', sort: true, filter: true, templet: function (d) {
+ return d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲� > 0 ? '<span style="color: red;">' + d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲� + '</span>' : d.鏈尮閰嶈鏂欒鍒掍俊鎭暟閲�;
+ }
+ });
} else if (isValidDate(data[i].name)) {
col.push({ field: data[i].name, title: Format(data[i].name, 'MM.dd'), width: 70, totalRow: true, filter: true })
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index fee3b12..41e0eb1 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -46,7 +46,27 @@
width: 25%;
}
</style>-->
-
+ <!--<style>
+ input::-webkit-calendar-picker-indicator {
+ display: none; /* 闅愯棌杈撳叆妗嗗彸渚х澶� */
+ }
+ </style>-->
+ <!--鐢ㄤ簬鎶ユ紡浜� 鎹熷潖鎯呭喌 鐨勬枃鏈鏀逛负涓嬫潵妗�-->
+ <style>
+ /* 閫夐」鍩虹鏍峰紡 */
+ .layui-nav-item {
+ padding: 0 20px;
+ line-height: 36px;
+ cursor: pointer;
+ transition: all 0.3s;
+ color: #000 !important; /* 寮哄埗榛戣壊瀛椾綋 */
+ }
+ /* 鎮仠鐘舵�� */
+ .layui-nav-item:hover {
+ background-color: #f8f8f8 !important;
+ color: #000 !important;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid" style="padding: 0;">
@@ -55,15 +75,15 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 2px; ">
<!--<button type="button" id="btnSearch" style="margin-left: 0px" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="btnSearch" >棰勮</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏂板</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">淇敼</button>-->
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">淇濆瓨</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">鍏抽棴</button>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">鍙嶅叧闂�</button>-->
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill">
<h1 style="text-align: center; padding: 10px 0;"><b>宸ョ▼椤圭洰</b></h1>
@@ -99,7 +119,7 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 120px; width:180px;">
- <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
</div>
</div>
</div>
@@ -112,7 +132,7 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <div class="layui-input-block" style="margin-left: 125px; width: 195px;">
<input type="date" class="layui-input" lay-verify="HEndDate" name="HEndDate" id="HEndDate" style="padding-left: 80px;">
</div>
</div>
@@ -152,6 +172,16 @@
<label class="layui-form-label" style="width: 85px;">缁撶畻閲戦</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" lay-verify="HLastMoney" name="HLastMoney" id="HLastMoney" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHDept" id="btnSearchHDept" 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-inline">
@@ -664,23 +694,17 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鎹熷潖鎯呭喌</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">婕忔按閲�</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HWaterLeakage" lay-verify="HWaterLeakage" id="HWaterLeakage">
</div>
- </div>
+ </div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绠″緞</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 150px;" >
+ <input type="text" name="HPipeDiameter" id="HPipeDiameter" class="layui-input" value="" style="float: left; width: 150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeDiameter" id="btnSearchHPipeDiameter" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -689,16 +713,38 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">绠￠亾鏉愯川</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" name="HPipeMaterial" id="HPipeMaterial" class="layui-input" value="" style="float: left; width: 150px; " >
+ <input type="text" name="HPipeMaterial" id="HPipeMaterial" class="layui-input" value="" style="float: left; width: 150px; ">
<button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHPipeMaterial" id="btnSearchHPipeMaterial" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎹熷潖鎯呭喌</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <!-- 杈撳叆妗� -->
+ <input type="text" class="layui-input" name="HBreakStatus" lay-verify="HBreakStatus" id="HBreakStatus" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
+
+ <!-- 涓嬫媺瀹瑰櫒 -->
+ <div id="dropdownMenu1" class="layui-anim layui-anim-upbit"
+ style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
+ <ul id="optionList1" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+ </div>
+ </div>
+ </div>
+
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鎶ユ紡浜�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HAlarmEmp" lay-verify="HAlarmEmp" id="HAlarmEmp">
+ <!-- 杈撳叆妗� -->
+ <input type="text" class="layui-input" name="HAlarmEmp" lay-verify="HAlarmEmp" id="HAlarmEmp" placeholder="璇疯緭鍏ユ垨閫夋嫨" autocomplete="off">
+
+ <!-- 涓嬫媺瀹瑰櫒 -->
+ <div id="dropdownMenu" class="layui-anim layui-anim-upbit"
+ style="display: none;position: absolute;width: 100%;max-height: 200px;overflow-y: auto;border: 1px solid #e6e6e6;background: #f8f8f8;z-index: 999;top: 40px;left: 0;">
+ <ul id="optionList" class="layui-nav layui-nav-tree" style="width: 100%; background:white"></ul>
+ </div>
</div>
</div>
</div>
@@ -711,8 +757,12 @@
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍙楃悊浜�</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HReceEmp" lay-verify="HReceEmp" id="HReceEmp">
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HReceEmp" lay-verify="HReceEmp" id="HReceEmp" value="" style="float: left; width: 150px; ">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHReceEmp" id="btnSearchHReceEmp" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+
</div>
</div>
<div class="layui-inline">
@@ -905,43 +955,43 @@
</div>
</div>
</div>
-
- </div>
- <div class="layui-tab" lay-filter="tab-POStockInBill">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
- <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
- </ul>
- <div class="layui-tab-content">
- <!--椤圭洰闃舵-->
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
- <script type="text/html" id="toolbarDemo">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
- </div>
- </script>
- </div>
- <!--椤圭洰鎴愬憳-->
- <div class="layui-tab-item">
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
- <script type="text/html" id="toolbarDemo1">
- <div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up1"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
- </div>
- </script>
- </div>
+
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
+ <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--椤圭洰闃舵-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
+ </div>
+ </script>
+ </div>
+ <!--椤圭洰鎴愬憳-->
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ <script type="text/html" id="toolbarDemo1">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn1"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up1"><i class="layui-icon layui-icon-form"></i>涓婁竴琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under1"><i class="layui-icon layui-icon-form"></i>涓嬩竴琛�</button>-->
+ </div>
+ </script>
</div>
</div>
-</form>
+ </div>
+ </form>
</div>
</div>
</div>
@@ -968,7 +1018,7 @@
</div>
</script>
<script>
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -999,6 +1049,22 @@
window.RowDatass = []; //f6闃舵瀹℃牳浜�
window.MemberData = []; //椤圭洰鎴愬憳
+
+ // 棰勫畾涔夐�夐」鏁版嵁
+ var dataList1 = [
+ { value: '琛ㄥ唴绠℃紡鎹�', title: '琛ㄥ唴绠℃紡鎹�' },
+ { value: '闃�闂ㄦ紡姘�', title: '闃�闂ㄦ紡姘�' },
+ { value: '绠¤韩婕忔按', title: '绠¤韩婕忔按' },
+ { value: '鎺ュ彛婕忔按', title: '鎺ュ彛婕忔按' },
+ { value: '姘磋〃鎹熷潖', title: '姘磋〃鎹熷潖' },
+ { value: '绠℃寲鐮�', title: '绠℃寲鐮�' }
+ ];
+ var dataList = [
+ { value: '鐢ㄦ埛', title: '鐢ㄦ埛' },
+ { value: '鐑嚎1330', title: '鐑嚎1330' },
+ { value: '鎶ヨ110', title: '鎶ヨ110' },
+ { value: '璋冩煡缁�', title: '璋冩煡缁�' }
+ ];
//鑾峰彇鍙傛暟
@@ -1059,9 +1125,15 @@
//鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
createBillNo();
- //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ //绂佺敤閮ㄩ棬鎸夐挳
+ $('#btnSearchHDept').addClass("layui-btn-disabled").attr("disabled", true);
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂� 閮ㄩ棬
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ $("#HDeptID").val(sessionStorage["HDeptID"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬ID
+ $("#HDeptName").val(sessionStorage["HDept"]); //鏍规嵁鐧诲綍鐢ㄦ埛甯﹀嚭閮ㄩ棬
//鍒濆鍖栭」鐩伐绋嬩富琛ㄥ紑濮嬫椂闂村拰缁撴潫鏃堕棿
$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -1107,9 +1179,14 @@
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
+
+ //涓嶇鐢ㄩ儴闂�
+ $('#btnSearchHDept').removeClass("layui-btn-disabled").attr("disabled", false);
+
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid1();
RoadBillMain(linterid);
+
}
//#endregion
@@ -1131,8 +1208,6 @@
form.on('submit(btnSearchHCus)', function () {
CusType = 1;
get_checkSearchHCus();
-
-
});
//#endregion
@@ -1182,8 +1257,6 @@
//#region 閫夋嫨椤圭洰绫诲埆鎸夐挳
form.on('submit(btnSearchHProjectClass)', function () {
get_checkSearchHProjectClass();
-
-
});
//#endregion
@@ -1216,7 +1289,7 @@
get_checkSearchHTestChecker();
});
//#endregion
-
+
//#region 閫夋嫨宸ヤ綔浜哄憳鎸夐挳
form.on('submit(btnSearchHTaskWorkEmp)', function () {
get_checkSearchHTaskWorkEmp();
@@ -1234,7 +1307,6 @@
get_checkSearchHPipeMaterial();
});
//#endregion
-
//#region 閫夋嫨浠诲姟瀹夎璐规寜閽�
form.on('submit(btnSearchHTaskSetupMoney)', function () {
@@ -1258,11 +1330,175 @@
form.on('submit(btnSearchHTaskWorkMoney)', function () {
get_checkSearchHTaskWorkMoney();
});
+ //#endregion
+
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnSearchHDept)', function () {
+ get_checkSearchHDept();
+ });
//#endregion
+ //#region 閫夋嫨鍙楃悊浜烘寜閽�
+ form.on('submit(btnSearchHReceEmp)', function () {
+ get_checkSearchHReceEmp();
+ });
+ //#endregion
+
+
+ //#region 鎹熷潖鎯呭喌 鐐瑰嚮浜嬩欢
+
+ // 鍒嗙鐒︾偣浜嬩欢鍜岃緭鍏ヤ簨浠�
+ $('#HBreakStatus').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」
+ renderOptions1('');
+ $('#dropdownMenu1').show();
+ }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」
+ var inputVal = $(this).val().trim();
+ renderOptions1(inputVal);
+ $('#dropdownMenu1').show();
+ });
+
+ // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺
+ $(document).on('click', function (e) {
+ if (!$(e.target).closest('#HBreakStatus, #dropdownMenu1').length) {
+ $('#dropdownMenu1').hide();
+ }
+ });
+ $('#HBreakStatus').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」
+ renderOptions1('');
+ $('#dropdownMenu1').show();
+ }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」
+ var inputVal = $(this).val().trim();
+ renderOptions1(inputVal);
+ $('#dropdownMenu1').show();
+ });
+
+ // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺
+ $(document).on('click', function (e) {
+ if (!$(e.target).closest('#HBreakStatus, #dropdownMenu1').length) {
+ $('#dropdownMenu1').hide();
+ }
+ });
+
+ // 娓叉煋閫夐」锛堟敮鎸佹樉绀哄叏閮級
+ function renderOptions1(filterText) {
+ var filteredData = filterText ?
+ dataList1.filter(function (item) {
+ return item.title.toLowerCase().includes(filterText.toLowerCase());
+ }) :
+ dataList1; // 鏃犺繃婊ゆ枃鏈椂鏄剧ず鍏ㄩ儴
+
+ var html = '';
+ if (filteredData.length > 0) {
+ filteredData.forEach(function (item) {
+ html += `<li class="layui-nav-item" data-value="${item.value}">${item.title}</li>`;
+ });
+ } else {
+ html = '<li class="layui-nav-item">鏃犲尮閰嶇粨鏋滐紙鍙嚜鐢辫緭鍏ワ級</li>';
+ }
+
+ $('#optionList1').html(html);
+ }
+
+ // 閫夐」鐐瑰嚮浜嬩欢
+ $('#optionList1').on('click', 'li', function () {
+ if (!$(this).text().includes('鏃犲尮閰嶇粨鏋�')) {
+ var selectedText = $(this).text();
+ $('#HBreakStatus').val(selectedText).trigger('input');
+ }
+ $('#dropdownMenu1').hide();
+ });
+ //#endregion
+
+ //#region 鎶ユ紡浜� 鐐瑰嚮浜嬩欢
+
+ // 鍒嗙鐒︾偣浜嬩欢鍜岃緭鍏ヤ簨浠�
+ $('#HAlarmEmp').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」
+ renderOptions('');
+ $('#dropdownMenu').show();
+ }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」
+ var inputVal = $(this).val().trim();
+ renderOptions(inputVal);
+ $('#dropdownMenu').show();
+ });
+
+ // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺
+ $(document).on('click', function (e) {
+ if (!$(e.target).closest('#HAlarmEmp, #dropdownMenu').length) {
+ $('#dropdownMenu').hide();
+ }
+ });
+ $('#HAlarmEmp').on('focus', function () { // 鐒︾偣浜嬩欢锛氭樉绀哄叏閮ㄩ�夐」
+ renderOptions('');
+ $('#dropdownMenu').show();
+ }).on('input', function () { // 杈撳叆浜嬩欢锛氳繃婊ら�夐」
+ var inputVal = $(this).val().trim();
+ renderOptions(inputVal);
+ $('#dropdownMenu').show();
+ });
+
+ // 鏂囨。鐐瑰嚮鍏抽棴涓嬫媺
+ $(document).on('click', function (e) {
+ if (!$(e.target).closest('#HAlarmEmp, #dropdownMenu').length) {
+ $('#dropdownMenu').hide();
+ }
+ });
+
+ // 娓叉煋閫夐」锛堟敮鎸佹樉绀哄叏閮級
+ function renderOptions(filterText) {
+ var filteredData = filterText ?
+ dataList.filter(function (item) {
+ return item.title.toLowerCase().includes(filterText.toLowerCase());
+ }) :
+ dataList; // 鏃犺繃婊ゆ枃鏈椂鏄剧ず鍏ㄩ儴
+
+ var html = '';
+ if (filteredData.length > 0) {
+ filteredData.forEach(function (item) {
+ html += `<li class="layui-nav-item" data-value="${item.value}">${item.title}</li>`;
+ });
+ } else {
+ html = '<li class="layui-nav-item">鏃犲尮閰嶇粨鏋滐紙鍙嚜鐢辫緭鍏ワ級</li>';
+ }
+
+ $('#optionList').html(html);
+ }
+
+ // 閫夐」鐐瑰嚮浜嬩欢
+ $('#optionList').on('click', 'li', function () {
+ if (!$(this).text().includes('鏃犲尮閰嶇粨鏋�')) {
+ var selectedText = $(this).text();
+ $('#HAlarmEmp').val(selectedText).trigger('input');
+ }
+ $('#dropdownMenu').hide();
+ });
+ //#endregion
+
+ //#region 鏃ユ湡鐐瑰嚮浜嬩欢
+ $(document).ready(function () {
+ // 鐐瑰嚮杈撳叆妗嗘椂瑙﹀彂锛堜粎榧犳爣鐐瑰嚮鐢熸晥锛�
+ $("#HDate").on('click', function (data) {
+ HDate = $("#HDate").val();
+ console.log("鐐瑰嚮鏃跺�硷細", HDate);
+ });
+
+ // 澶辩劍鏃惰Е鍙戯紙鍖呮嫭閿洏鎿嶄綔锛�
+ $("#HDate").on('blur', function (data) {
+ HDate = $("#HDate").val();
+ $("#HDate").val(HDate); // 杩欒瀹為檯鍙互鐪佺暐锛屽洜涓哄�兼湭鏀瑰彉
+ GetHProjectNumber();
+ console.log("澶辩劍鏃跺�硷細", HDate);
+ });
+ });
+ //#endregion
+
+
+ //endregion
+
+
//#endregion
//#region 澶嶉�夋 閫変腑/鍙栨秷 瑙﹀彂浜嬩欢
+
//#region 閲岀▼纰�
form.on('checkbox(HIsKey)', function (data) {
//鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
@@ -1286,7 +1522,8 @@
}
});
});
- //#endregion
+ //#endregion
+
//#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
@@ -1351,7 +1588,7 @@
CheckedSet_tableSub_Emp();
} else {
var HSumMoney = $("#HSumMoney").val();
- if ( ref.test(value) && ref.test(HSumMoney) ) {
+ if (ref.test(value) && ref.test(HSumMoney)) {
obj.update({
HPlanAvgMoney: ((HSumMoney * value) / 100).toFixed(8) //棰勮鍒嗛厤涓氱哗=鍚堝悓鎬婚噾棰�*椤圭洰鍗犳瘮
, HPlanCountMoney: (((HSumMoney * value) / 100) * 0.07).toFixed(8) //(椤圭洰鎻愭垚)棰勮鎻愭垚=棰勮鍒嗛厤涓氱哗*0.07
@@ -1505,7 +1742,7 @@
var field = $(this).data('field');
laydate.render({
elem: this.firstChild
- , show: true //鐩存帴鏄剧ず
+ , show: true //鐩存帴鏄剧ず
, closeStop: this
, done: function (nowDate) {
//鏃堕棿閫夋嫨瀹屾垚锛岃鏁版嵁鏇存柊
@@ -1662,7 +1899,7 @@
, height: 400
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;'}
+ , { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
, { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
, { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
, { field: 'HProjectStageName', title: '椤圭洰闃舵', edit: 'text', event: "HProjectStageName" } //f7
@@ -1723,7 +1960,7 @@
, { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
, { field: 'HRate', title: '椤圭洰鍗犳瘮', edit: 'text', totalRow: true }
, { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', edit: 'text', totalRow: true }
- , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', edit: 'text', totalRow: true}
+ , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', edit: 'text', totalRow: true }
, { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
]]
@@ -1919,7 +2156,7 @@
//鑾峰彇鏁版嵁
$("#HProjectClassID").val(checkStatus.data[0].HItemID);//椤圭洰绫诲埆id
$("#HProjectClassName").val(checkStatus.data[0].椤圭洰绫诲埆鍚嶇О);//椤圭洰绫诲埆鍚嶇О
-
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -1989,7 +2226,7 @@
}
, btn2: function (index, layero) { }
, end: function () {
-
+
get_BT($("#HProjectStageBillInterID").val());
}
})
@@ -2165,7 +2402,7 @@
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
- }
+ }
//鑾峰彇鏁版嵁
$("#HPipeDiameter").val(checkStatus.data[0].绠″緞鍚嶇О);//绠″緞鍚嶇О
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -2178,7 +2415,7 @@
//#region 绠″緞鏉愯川閫夋嫨椤甸潰
- function get_checkSearchHPipeMaterial() {
+ function get_checkSearchHPipeMaterial() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -2311,6 +2548,58 @@
}
//#endregion
+
+ //#region 閮ㄩ棬閫夋嫨椤甸潰
+ function get_checkSearchHDept() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閮ㄩ棬鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鑱屽憳閫夋嫨椤甸潰
+ function get_checkSearchHReceEmp() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鑱屽憳鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?type=HEmp', '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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HReceEmp").val(checkStatus.data[0].鑱屽憳鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
//#region 椤圭洰闃舵娓呭崟 閫夋嫨 甯﹀嚭琛ㄤ綋鏁版嵁
function get_BT(HBillInterID) {
$.ajax({
@@ -2387,9 +2676,10 @@
//鑾峰彇鏁版嵁
$("#HTaskClassID").val(checkStatus.data[0].HItemID);
$("#HTaskClassName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
- $("#HTaskClassNumber").val(checkStatus.data[0].浠诲姟绫诲埆浠ｇ爜);
-
+ $("#HTaskClassNumber").val(checkStatus.data[0].浠诲姟绫诲埆浠ｇ爜);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鏇存柊椤圭洰浠ｇ爜
+ GetHProjectNumber();
}
, btn2: function (index, layero) { }
, end: function () {
@@ -2409,7 +2699,7 @@
var strurl = '../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html'
if ($("#HTaskClassNumber").val() != "") {
strurl = "../../椤圭洰绠＄悊/鍩虹寤烘ā/Gy_TaskClass.html?type=HTaskClass&HNumber=" + $("#HTaskClassNumber").val()
- }
+ }
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
@@ -2428,6 +2718,8 @@
$("#HTaskClassEntryID").val(checkStatus.data[0].HItemID);
$("#HTaskClassEntryName").val(checkStatus.data[0].浠诲姟绫诲埆鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //鏇存柊椤圭洰浠ｇ爜
+ GetHProjectNumber();
}
, btn2: function (index, layero) { }
, end: function () {
@@ -2655,6 +2947,9 @@
, "HContacts": tableMain[0]["HContacts"]
, "HContactNumber": tableMain[0]["HContactNumber"]
+ , "HDeptID": tableMain[0]["HDeptID"]
+ , "HDeptName": tableMain[0]["HDeptName"]
+
, "HSupplierID": tableMain[0]["HSupplierID"]
, "HSupplierName": tableMain[0]["HSupplierName"]
, "HMangerEmpID": tableMain[0]["HMangerEmpID"]
@@ -2691,7 +2986,7 @@
"HWaterLeakage": tableMain[0]["HWaterLeakage"],
"HPipeDiameter": tableMain[0]["HPipeDiameter"],
"HPipeMaterial": tableMain[0]["HPipeMaterial"],
- "HAlarmEm": tableMain[0]["HAlarmEm"],
+ "HAlarmEmp": tableMain[0]["HAlarmEmp"],
"HAlarmLink": tableMain[0]["HAlarmLink"],
"HReceEmp": tableMain[0]["HReceEmp"],
"HReceTime": tableMain[0]["HReceTime"],
@@ -2815,7 +3110,7 @@
//#region 椤圭洰闃舵琛ㄦ暟鎹楠�
for (var i = 0; i < option.data.length; i++) {
if (option.data[i] != "") {
-
+
////椤圭洰闃舵闈炵┖妫�楠�
//if (option.data[i]["HProjectStageID"] == "0") {
// layer.msg("绗�" + (i + 1) + "琛�:椤圭洰闃舵涓嶈兘涓虹┖!");
@@ -2962,6 +3257,28 @@
return true;
}
//#endregion
+
+ //#region 锛堜换鍔＄被锛夌殑宸ョ▼椤圭洰鏂板
+ //浠诲姟澶х被 浠诲姟椤圭洰鍒嗙被 鏃ユ湡 鍙樺寲鏃讹紝鏇存柊 椤圭洰浠ｇ爜
+
+ function GetHProjectNumber() {
+ $.ajax({
+ url: GetWEBURL() + '/PM_ProjectBill/GetHProjectHNumber',
+ type: "GET",
+ async: false,
+ data: { "HDeptID": $("#HDeptID").val(), "HDate": $("#HDate").val(), "HTaskClassID": $("#HTaskClassID").val(), "HTaskClassEntryID": $("#HTaskClassEntryID").val()},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data[0];
+ $("#HProNumber").val(data.HBillNo)
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //#endRegion
//#region 椤圭洰闃舵琛ㄥご宸ュ叿鏍忎簨浠讹細涓婁竴琛�
function btn_up(data) {
@@ -3233,7 +3550,7 @@
obj.event = "";
return false;
- }else if (event.key == "F6") {
+ } else if (event.key == "F6") {
//闃舵璐熻矗浜�
if (obj.event == "HEmpName") {
var HOrgID = $("#HOrgID").val();
@@ -3430,6 +3747,7 @@
})
}
//#endregion
+
//#region 椤圭洰闃舵琛細鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
HModName = "PM_ProjectBillSub";
@@ -3441,7 +3759,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["RowID","琛屽彿","椤圭洰闃舵ID","鐩稿叧浜や粯鐗㊣D","闃舵璐熻矗浜篒D","闃舵瀹℃牳浜篒D"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["RowID", "琛屽彿", "椤圭洰闃舵ID", "鐩稿叧浜や粯鐗㊣D", "闃舵璐熻矗浜篒D", "闃舵瀹℃牳浜篒D"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -3553,6 +3871,7 @@
})
}
//#endregion
+
//#region 椤圭洰鎴愬憳琛細鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn1() {
HModName = "PM_ProjectBillSub_Emp";
@@ -3565,7 +3884,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["琛屽彿","椤圭洰鎴愬憳ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["琛屽彿", "椤圭洰鎴愬憳ID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -3652,6 +3971,7 @@
form.render('checkbox');
}
//#endregion
+
//#region 椤圭洰鎴愬憳琛�-鍒锋柊璁剧疆澶嶉�夋鐘舵��
function CheckedSet_tableSub_Emp() {
var tableSub_Emp = option1.data;
@@ -3748,7 +4068,7 @@
ProjectCheckData = obj;
}
//f6闃舵璐熻矗浜�
- function GetHManagerValue(obj) {
+ function GetHManagerValue(obj) {
RowDatas = obj;
}
//闃舵璐熻矗浜�
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 26fbd36..0f0d08e 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -107,6 +107,60 @@
<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
</div>
</div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top:5px">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -122,6 +176,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MoneyDeAudit" id="MoneyDeAudit"><i class="layui-icon layui-icon-circle"></i>璐圭敤鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-MoneyDeSave" id="MoneyDeSave"><i class="layui-icon layui-icon-circle"></i>璐圭敤鍙嶄繚瀛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>鍏抽棴</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>鍙嶅叧闂�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
@@ -129,7 +184,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ProjectReport" id="set_ProjectReport"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(闃舵姹囨姤)</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTask" id="set_WorkTask"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(宸ヤ綔浠诲姟)</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
@@ -176,7 +231,7 @@
//#region 銆愯繃婊ゆ柟妗堛��
- //杩囨护鏉′欢鐨刢lass绫�
+ //杩囨护鏉′欢鐨刢lass绫�
var HClassTag = "ForFilteringSchemes";
//妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
window.HModuleName = "宸ョ▼椤圭洰缁存姢";
@@ -231,6 +286,10 @@
//鍙嶅鏍告寜閽�
case 'btn-MoneyDeAudit':
set_CheckMoneyBill("UnCheck");
+ break;
+ //璐圭敤鍙嶄繚瀛樻寜閽�
+ case 'btn-MoneyDeSave':
+ set_SaveMoneyBill("UnSave");
break;
//鍏抽棴鎸夐挳 锛�1:鍏抽棴銆�2:鍙嶅叧闂級
case 'btn-Close':
@@ -577,10 +636,18 @@
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProNumber = $("#HProNumber").val();//椤圭洰浠ｇ爜
var HProName = $("#HProName").val();//椤圭洰鍚嶇О
+ var HDeptID = sessionStorage["HDeptID"];
//浠绘剰瀛楁杩囨护
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 = "";
@@ -603,13 +670,57 @@
}
sWhere += " and " + ColName + " " + com;
}
+ if (ColName1 != 0 && Comparator1 != 0) {
+ var com1 = "";
+ switch (Comparator1) {
+ case "7":
+ com1 = "like'%" + ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + Comparator1 + "'" + ColContent1 + "'";
+ break;
+ }
+ sWhere += " and " + ColName1 + " " + com1;
+ }
+ if (ColName2 != 0 && Comparator2 != 0) {
+ var com2 = "";
+ switch (Comparator2) {
+ case "7":
+ com2 = "like'%" + ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + Comparator2 + "'" + ColContent2 + "'";
+ break;
+ }
+ sWhere += " and " + ColName2 + " " + com2;
+ }
if (addSWhereByOpenType()) {
HOrgID = sessionStorage["OrganizationID"];
}
else {
HOrgID = $("#HOrgID").val();//缁勭粐
}
-
+ if (HDeptID !=0) {
+ sWhere += " and HDeptID = '" + HDeptID + "'";
+ }
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
@@ -642,6 +753,12 @@
$("#ColContent").val("");
$("#ColName").val("0");
$("#Comparator").val("0");
+ $("#ColContent2").val("");
+ $("#ColName2").val("0");
+ $("#Comparator2").val("0");
+ $("#ColContent1").val("");
+ $("#ColName1").val("0");
+ $("#Comparator1").val("0");
form.render('select');
sWhere = "";
@@ -815,6 +932,42 @@
type: "GET",
url: GetWEBURL() + "/PM_ProjectBill/AuditTaskMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: { "HInterID": InterID, "Type": type, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
+ //#region 璐圭敤鍙嶄繚瀛樻暟鎹�
+ function set_SaveMoneyBill(type) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_ProjectBill/SaveTaskMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": type, "user": sessionStorage["HUserName"],"HMoney":0 },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1137,6 +1290,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -1157,7 +1314,7 @@
function addSWhereByOpenType() {
//鑾峰彇鍙傛暟
var params = getUrlVars();
- var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
var HOrgID = params[params[1]];
HBillSubType = (decodeURI(params[params[2]]) != "宸ョ▼绫�" && decodeURI(params[params[2]]) != "浠诲姟绫�") ? "椤圭洰绫�" : decodeURI(params[params[2]]);//鑻ヨВ鐮佸悗type涓嶄负宸ョ▼鎴栦换鍔″己鍒跺彉涓洪」鐩�
if (HBillSubType == "宸ョ▼绫�") {
@@ -1171,7 +1328,7 @@
form.render("select");
return true;
}
-
+
return false;
}
//#endregion
@@ -1239,7 +1396,7 @@
for (var i = 0; i < Filter.length; i++) {
HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
}
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
index f592c1c..7871d93 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedCheckQuery.html"
@@ -137,20 +137,12 @@
</div>
</div>
<div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰闃舵</li>
- <li lay-id="2" style="padding:1px;">椤圭洰鎴愬憳</li>
- </ul>
- <div class="layui-tab-content">
- <!--椤圭洰闃舵-->
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
- <!--椤圭洰鎴愬憳-->
- <div class="layui-tab-item">
- <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
- </div>
- </div>
+ </script>
</div>
</div>
</div>
@@ -162,18 +154,6 @@
</div>
</div>
</div>
- <!--閲岀▼纰�-->
- <script type="text/html" id="HIsKey">
- <div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HIsKey" lay-filter="HIsKey" id="HIsKey{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
- </div>
- </script>
- <!--椤圭洰缁忕悊-->
- <script type="text/html" id="HIsPM">
- <div class="layui-input-block" style="margin-left: 20px;">
- <input type="checkbox" name="HIsPM" lay-filter="HIsPM" id="HIsPM{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
- </div>
- </script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -198,7 +178,7 @@
//#endregion
//#endregion
var HModName = "PM_ProjectTaskNeedCheckQuery";
-
+ var HModName2 = "PM_ProjectTaskNeedCheckQuery_SellOut";
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -235,6 +215,15 @@
break;
};
});
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option, function () { });
+ break;
+
+ };
+ });
+
//#endregion
//#region 閫�鍑�
@@ -274,6 +263,7 @@
//鏄剧ず椤圭洰淇℃伅
RoadBillMain(obj.data["HInterID"]);
+
})
//#endregion
@@ -343,90 +333,15 @@
option = {
elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- //, page: true
- //, limit: 500
- //, limits: [50, 500, 5000, 50000]
- , totalRow: true
- , cellMinWidth: 120
- , height: 400
- , cols: [[
- //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
- , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HProjectStageID', title: '椤圭洰闃舵ID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HProjectStageName', title: '椤圭洰闃舵', event: "HProjectStageName" } //f7
- , { field: 'HStageNote', title: '椤圭洰璇︾粏鍐呭', style: 'background-color: #f9f9f9;' }
- , { field: 'HPMGoodsID', title: '鐩稿叧浜や粯鐗㊣D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HPMGoodsName', title: '鐩稿叧浜や粯鐗�', event: "HPMGoodsName" } //f7
- , { field: 'HIsKey', title: '閲岀▼纰�', templet: "#HIsKey" }
- , { field: 'HRate', title: '涓氱哗鍗犳瘮', totalRow: true }
- , { field: 'HEmpID', title: '闃舵璐熻矗浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEmpName', title: '闃舵璐熻矗浜�', event: "HEmpName" } //f7
- , { field: 'HCheckEmpID', title: '闃舵瀹℃牳浜篒D', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HCheckEmpName', title: '闃舵瀹℃牳浜�', event: "HCheckEmpName" } //f7
- , { field: 'HFinishDate', title: '棰勮瀹屾垚鏃ユ湡', event: "HFinishDate" }
- , { field: 'HWorkDays', title: '棰勮浜哄ぉ', totalRow: true }
- , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
- ]]
- }
- var rowdata = [
- {
- "RowID": 10
- , 'HProjectStageID': '0'
- , 'HProjectStageName': ''
- , 'HStageNote': ''
- , 'HPMGoodsID': '0'
- , 'HPMGoodsName': ''
- , 'HIsKey': false
- , 'HRate': '0'
- , 'HEmpID': '0'
- , 'HEmpName': ''
- , 'HCheckEmpID': '0'
- , 'HCheckEmpName': ''
- , 'HFinishDate': ''
- , 'HWorkDays': '0'
- , 'HRemarkSub': ''
- }
- ];
- option.data = rowdata;
- table.render(option);
- option1 = {
- elem: '#mainTable1'
- //, toolbar: '#toolbarDemo1'
- , page: false
- , totalRow: true
+ , toolbar: '#toolbarDemo'
+ , page: true
, limit: 500
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 1000, 2000]
+ , totalRow: true
, cellMinWidth: 120
- , height: 400
- , cols: [[
- //{ type: 'checkbox', totalRowText: '鍚堣琛�' }
- { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
- , { field: 'RowID', title: '琛屽彿', hide: true, style: 'background-color: #f9f9f9;' } //琛屾爣璇嗭紝鐢ㄤ簬涓嬩竴琛屻�佷笂涓�琛岃瘑鍒墍鍦ㄨ
- , { field: 'HEmployeeID', title: '椤圭洰鎴愬憳ID', hide: true, style: 'background-color: #f9f9f9;' }
- , { field: 'HEmployeeName', title: '椤圭洰鎴愬憳', event: "HEmployeeName" } //f7
- , { field: 'HIsPM', title: '鏄惁椤圭洰缁忕悊', templet: "#HIsPM" }
- , { field: 'HRate', title: '椤圭洰鍗犳瘮', totalRow: true }
- , { field: 'HPlanAvgMoney', title: '棰勮鍒嗛厤涓氱哗', totalRow: true }
- , { field: 'HPlanCountMoney', title: '棰勮鎻愭垚', totalRow: true }
- , { field: 'HRemarkSub', title: '澶囨敞', edit: 'text' }
- ]]
+ , height: 600
+ , cols: [[]]
}
- var rowdata1 = [
- {
- "RowID": 10
- , 'HEmployeeID': '0'
- , 'HEmployeeName': ''
- , 'HIsPM': false
- , 'HRate': '0'
- , 'HPlanAvgMoney': '0'
- , 'HPlanCountMoney': '0'
- , 'HRemarkSub': ''
- }
- ];
- option1.data = rowdata1;
- table.render(option1);
}
//#endregion
@@ -436,6 +351,7 @@
$.ajax({
url: GetWEBURL() + '/PM_ProjectBill/NeedCheckQuery',
type: "GET",
+ async: false,
data: {"user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -472,7 +388,7 @@
optionNeedCheck.cols = [col];
optionNeedCheck.data = data1.data;
//鍒楄缃�
- DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedCheck);
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedCheck, titleData);
ins = table.render(optionNeedCheck);
layer.close(ajaxLoad);
} else {
@@ -498,8 +414,6 @@
data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
success: function (result) {
var tableMain = result.data[0];
- var tableSub = result.data[1];
- var tableSub_Emp = result.data[2];
//涓昏〃 璧嬪��
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HInterID": tableMain[0]["HInterID"]
@@ -531,39 +445,82 @@
if (tableMain[0]["HTaskWorkMoneyCheckFlag"] == false) {
$('#btnCheckWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
}
- //娓叉煋椤圭洰闃舵琛�
- //璁剧疆椤圭洰闃舵琛ㄥ畬鎴愭棩鏈熺殑鏍煎紡
- for (var i = 0; i < tableSub.length; i++) {
- tableSub[i]["HFinishDate"] = Format(new Date(tableSub[i]["HFinishDate"]), "yyyy-MM-dd");
- tableSub[i].RowID = (i + 1) * 10;
- }
- option.data = tableSub;
- table.render(option);
- //瀵瑰瓙琛ㄤ腑鐨勫閫夋杩涜閫変腑
- for (var i = 0; i < tableSub.length; i++) {
- if (tableSub[i].HIsKey) {
- $('#HIsKey' + (i + 1)).attr("checked", true);
- }
- }
form.render('checkbox');
- //娓叉煋椤圭洰鎴愬憳琛�
- for (var i = 0; i < tableSub_Emp.length; i++) {
- tableSub_Emp[i].RowID = (i + 1) * 10;
- }
- option1.data = tableSub_Emp;
- table.render(option1);
- //瀵瑰瓙琛ㄤ腑鐨勯」鐩粡鐞嗗閫夋杩涜閫変腑
- for (var i = 0; i < tableSub_Emp.length; i++) {
- if (tableSub_Emp[i].HIsPM) {
- $('#HIsPM' + (i + 1)).attr("checked", true);
- }
- }
- form.render('checkbox');
+ RoadBillSub(linterid);
}
})
}
//#endregion
+ //#region 鑾峰彇閿�鍞嚭搴撳崟鍒楄〃
+ function RoadBillSub(linterid)//鍔犺浇琛ㄥご
+ {
+ var ajaxLoad = layer.load();//閬僵
+ //鏄庣粏鍒楄〃
+ var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid ;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //缁熻鏉愭枡璐�
+ let totalAmount = data1.data.reduce((accumulator, currentValue) => {
+ return accumulator + currentValue.閲戦;
+ }, 0);
+ $("#HTaskMaterMoney").val(totalAmount);
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option, titleData);
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ //#endregion
+
//#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(type) {
var HInterID = $("#HInterID").val();
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
new file mode 100644
index 0000000..e705d63
--- /dev/null
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectTaskNeedSaveQuery.html"
@@ -0,0 +1,744 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>椤圭洰璐圭敤寰呬繚瀛樺垪琛�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <!--寮曠敤layui鏍峰紡鏂囦欢-->
+ <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/PageTitle.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <style type="text/css">
+ </style>
+</head>
+<body>
+
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="">
+ <div class="layui-card-body" style="padding:1px">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div>
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">閫�鍑�</button>
+ </div>
+
+ <div class="layui-col-xs6">
+ <div class="layui-tab layui-tab-card" lay-filter="table">
+ <ul class="layui-tab-title">
+ <li class="layui-this">寰呬繚瀛樺垪琛�</li>
+ </ul>
+ <div class="layui-tab-content" style="padding:0px;">
+ <div class="layui-tab-item layui-show">
+ <table class="" id="mainTableNeedSave" lay-filter="mainTableNeedSave"></table>
+ <script type="text/html" id="toolbarDemoNeedSave">
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs6">
+ <div class="layui-tab layui-tab-card" lay-filter="table">
+ <ul class="layui-tab-title">
+ <li lay-id="1" style="padding:1px;" class="layui-this">椤圭洰淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content" style="padding:0px;">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px; background-color: white" lay-filter="">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
+ <input type="hidden" name="HBillSubType" id="HBillSubType" value="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">椤圭洰鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProName" name="HProName" id="HProName" readonly>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px; width:180px;">
+ <input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 40px;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟瀹夎璐�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="number" class="layui-input" name="HTaskSetupMoney" lay-verify="HTaskSetupMoney" id="HTaskSetupMoney" value="0" style="float: left; width: 120px" >
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskSetupMoney" id="btnSearchHTaskSetupMoney" style="width: 40px; float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveSetupMoney" id="btnSaveSetupMoney" style="float: left; padding: 0 10px;">
+ 淇濆瓨
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟闄勫睘璐�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="number" class="layui-input" name="HTaskOtherMoney" lay-verify="HTaskOtherMoney" id="HTaskOtherMoney" value="0" style="float: left; width: 120px" >
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskOtherMoney" id="btnSearchHTaskOtherMoney" style="width: 40px; float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveOtherMoney" id="btnSaveOtherMoney" style="float: left; padding: 0 10px;">
+ 淇濆瓨
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鑰冩牳璐�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="number" class="layui-input" name="HTaskExamMoney" lay-verify="HTaskExamMoney" id="HTaskExamMoney" value="0" style="float: left; width: 120px" >
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskExamMoney" id="btnSearchHTaskExamMoney" style="width: 40px; float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveExamMoney" id="btnSaveExamMoney" style="float: left; padding: 0 10px;">
+ 淇濆瓨
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟宸ヨ垂</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="number" class="layui-input" name="HTaskWorkMoney" lay-verify="HTaskWorkMoney" id="HTaskWorkMoney" value="0" style="float: left; width: 120px" >
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearchHTaskWorkMoney" id="btnSearchHTaskWorkMoney" style="width: 40px; float: left;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSaveWorkMoney" id="btnSaveWorkMoney" style="float: left; padding: 0 10px;">
+ 淇濆瓨
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">浠诲姟鏉愭枡璐�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="number" class="layui-input" name="HTaskMaterMoney" lay-verify="HTaskMaterMoney" id="HTaskMaterMoney" value="0" readonly>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab" lay-filter="tab-POStockInBill" style=" background-color: white">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ </div>
+ </script>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏敤鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ var option = [];
+ var optionNeedSave = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["hmainid", "HBillType", "HSupID", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID",
+ "HFeedback", "HPriority", "HUserID", "甯佸埆浠ｇ爜", "閲囪喘鏂瑰紡浠ｇ爜", "缁撶畻鏂瑰紡浠ｇ爜", "閮ㄩ棬浠ｇ爜", "涓荤浠ｇ爜", "涓氬姟鍛樹唬鐮�", "璁￠噺鍗曚綅浠ｇ爜", "HSaveFlowStatusID", "HSaveFlowID","HSaveItemID"];
+ //#endregion
+ var HModName = "PM_ProjectTaskNeedSaveQuery";
+ var HModName2 = "PM_ProjectTaskNeedSaveQuery_SellOut";
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display();
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTableNeedSave)', function (obj) {
+ switch (obj.event) {
+ ////缂栬緫
+ //case 'btn-Edit': get_ShowBill('mainTableNeedSave');
+ // break;
+ //鍒锋柊
+ case 'get_Refresh': get_Display();
+ break;
+ //瀵煎嚭excel
+ case 'get_export':
+ optionNeedSave.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, optionNeedSave.data, "xls");
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], optionNeedSave, get_Display);
+ break;
+ };
+ });
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumnNoPage(HModName2, sessionStorage["HUserName"], option, function () { });
+ break;
+
+ };
+ });
+
+ //#endregion
+
+ //#region 閫�鍑�
+ form.on('submit(btnEdit)', function (data) {
+ Pub_Close(2);
+ });
+ //#endregion
+
+
+ //#region 淇濆瓨
+ form.on('submit(btnSaveSetupMoney)', function (data) {
+ set_SaveBill("SetupMoneySave", $("#HTaskSetupMoney").val() == "" ? 0 : $("#HTaskSetupMoney").val());
+ $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ });
+ form.on('submit(btnSaveOtherMoney)', function (data) {
+ set_SaveBill("OtherMoneySave", $("#HTaskOtherMoney").val() == "" ? 0 : $("#HTaskOtherMoney").val())
+ $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ });
+ form.on('submit(btnSaveExamMoney)', function (data) {
+ set_SaveBill("ExamMoneySave", $("#HTaskExamMoney").val() == "" ? 0 : $("#HTaskExamMoney").val())
+ $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ });
+ form.on('submit(btnSaveWorkMoney)', function (data) {
+ set_SaveBill("WorkMoneySave", $("#HTaskWorkMoney").val() == "" ? 0 : $("#HTaskWorkMoney").val())
+ $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ });
+ //#endregion
+
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ table.on('row(mainTableNeedSave)', function (obj) {
+ //閫変腑琛屾敼鍙橀鑹�
+ var flag = !obj.tr.find(':radio:first').prop('checked');
+ obj.tr.find(':radio').prop('checked', flag);
+ $('tr').attr({ "style": "background:" });
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ //obj.tr.find('.layui-form-radio').addClass('layui-form-radioed');
+
+ //鏄剧ず椤圭洰淇℃伅
+ RoadBillMain(obj.data["HInterID"]);
+
+ })
+ //#endregion
+
+ //#region 鎺掑簭
+ table.on('sort(mainTableNeedSave)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+ table.reload('mainTableNeedSave', {
+ initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+ , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+ field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙ｄ綔涓哄弬鏁板瓧娈� field order
+ }
+ });
+ optionNeedSave.data = layui.table.cache["mainTableNeedSave"];
+ table.render(optionNeedSave);
+ });
+ //#endregion
+ //鍗曟嵁鍙疯秴閾炬帴
+ table.on('tool(mainTableNeedSave)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '鍗曟嵁鍙�') {
+ var linterid = data.HInterID.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫閲囪喘璁㈠崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+ }
+ });
+
+ //#region 閫夋嫨浠诲姟瀹夎璐规寜閽�
+ form.on('submit(btnSearchHTaskSetupMoney)', function () {
+ get_checkSearchHTaskSetupMoney();
+ });
+ //#endregion
+
+ //#region 閫夋嫨浠诲姟闄勫睘璐规寜閽�
+ form.on('submit(btnSearchHTaskOtherMoney)', function () {
+ get_checkSearchHTaskOtherMoney();
+ });
+ //#endregion
+
+ //#region 閫夋嫨浠诲姟鑰冩牳璐规寜閽�
+ form.on('submit(btnSearchHTaskExamMoney)', function () {
+ get_checkSearchHTaskExamMoney();
+ });
+ //#endregion
+
+ //#region 閫夋嫨浠诲姟宸ヨ垂鎸夐挳
+ form.on('submit(btnSearchHTaskWorkMoney)', function () {
+ get_checkSearchHTaskWorkMoney();
+ });
+ //#endregion
+
+
+ //#endregion
+
+ //#region 璇ラ〉闈㈡墍鏈夋柟娉�
+ //#region 鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐐瑰嚮
+ $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+
+ optionNeedSave = {
+ elem: '#mainTableNeedSave'
+ , toolbar: '#toolbarDemoNeedSave'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 120
+ , height: 'full-120'
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , data : []
+ };
+
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: true
+ , limit: 500
+ , limits: [50, 500, 1000, 2000]
+ , totalRow: true
+ , cellMinWidth: 120
+ , height: 600
+ , cols: [[]]
+ }
+ }
+ //#endregion
+
+ //#region 鍔犺浇琛ㄦ牸
+ function get_Display() {
+ var ajaxLoad = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/PM_ProjectBill/NeedSaveQuery',
+ type: "GET",
+ async: false,
+ data: {"user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+ }, style: 'cursor: pointer;'
+ });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ optionNeedSave.cols = [col];
+ optionNeedSave.data = data1.data;
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName, sessionStorage["HUserName"], optionNeedSave, titleData);
+ ins = table.render(optionNeedSave);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
+ //#region 缂栬緫 椤甸潰璧嬪��
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+ {
+ $.ajax({
+ url: GetWEBURL() + "/PM_ProjectBill/editInit",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var tableMain = result.data[0];
+ //涓昏〃 璧嬪��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": tableMain[0]["HInterID"]
+ , "HProNumber": tableMain[0]["HProNumber"]
+ , "HProName": tableMain[0]["HProName"]
+ , "HBillNo": tableMain[0]["HBillNo"]
+ , "HDate": Format(new Date(tableMain[0]["HDate"]), "yyyy-MM-dd")
+ ,"HTaskMaterMoney": tableMain[0]["HTaskMaterMoney"],
+ "HTaskSetupMoney": tableMain[0]["HTaskSetupMoney"],
+ "HTaskOtherMoney": tableMain[0]["HTaskOtherMoney"],
+ "HTaskExamMoney": tableMain[0]["HTaskExamMoney"],
+ "HTaskWorkMoney": tableMain[0]["HTaskWorkMoney"],
+
+ });
+ //淇濆瓨鎸夐挳璁剧疆
+ $('#btnSaveSetupMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveOtherMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveExamMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ $('#btnSaveWorkMoney').prop('disabled', true).addClass('layui-btn-disabled');
+ if (tableMain[0]["HTaskSetupMoneySaveFlag"] == false) {
+ $('#btnSaveSetupMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+ }
+ if (tableMain[0]["HTaskOtherMoneySaveFlag"] == false) {
+ $('#btnSaveOtherMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+ }
+ if (tableMain[0]["HTaskExamMoneySaveFlag"] == false) {
+ $('#btnSaveExamMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+ }
+ if (tableMain[0]["HTaskWorkMoneySaveFlag"] == false) {
+ $('#btnSaveWorkMoney').prop('disabled', false).removeClass('layui-btn-disabled');
+ }
+ form.render('checkbox');
+ RoadBillSub(linterid);
+ }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇閿�鍞嚭搴撳崟鍒楄〃
+ function RoadBillSub(linterid)//鍔犺浇琛ㄥご
+ {
+ var ajaxLoad = layer.load();//閬僵
+ //鏄庣粏鍒楄〃
+ var sql = "exec h_p_PM_GetSellOutBillListByHProjectID " + linterid ;
+ $.ajax({
+ url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sql },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ var titleData = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120, filter: true });
+ } else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, filter: true, templet: "<div>{{d." + (data[i].name == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, filter: true });
+ }
+ }
+ }
+ option.cols = [col];
+ option.data = data1.data;
+ //缁熻鏉愭枡璐�
+ let totalAmount = data1.data.reduce((accumulator, currentValue) => {
+ return accumulator + currentValue.閲戦;
+ }, 0);
+ $("#HTaskMaterMoney").val(totalAmount);
+ //鍒楄缃�
+ DisPlay_HideColumn(HModName2, sessionStorage["HUserName"], option, titleData);
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鍙嶄繚瀛�/淇濆瓨鏁版嵁
+ function set_SaveBill(type,HMoney) {
+ var HInterID = $("#HInterID").val();
+ if (HInterID != 0) {
+ //閫昏緫淇濆瓨鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_ProjectBill/SaveTaskMoney", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "Type": type, "user": sessionStorage["HUserName"], "HMoney": HMoney },
+ 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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ get_Display();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹繚瀛橈紒');
+ }
+ }
+ //#endregion
+
+ //#region 浠诲姟瀹夎璐归�夋嫨椤甸潰
+ function get_checkSearchHTaskSetupMoney() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '绠″緞鏉愯川琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoneyClass.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ var HItemID = checkStatus.data[0].HItemID;
+ //鑾峰彇鏁版嵁
+ getGy_ProjectMoney(1, HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 浠诲姟闄勫睘璐归�夋嫨椤甸潰
+ function get_checkSearchHTaskOtherMoney() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '绠″緞鏉愯川琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoneyClass.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ var HItemID = checkStatus.data[0].HItemID;
+ //鑾峰彇鏁版嵁
+ getGy_ProjectMoney(2, HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 浠诲姟鑰冩牳璐归�夋嫨椤甸潰
+ function get_checkSearchHTaskExamMoney() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '绠″緞鏉愯川琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoneyClass.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ var HItemID = checkStatus.data[0].HItemID;
+ //鑾峰彇鏁版嵁
+ getGy_ProjectMoney(3, HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 浠诲姟宸ヨ垂閫夋嫨椤甸潰
+ function get_checkSearchHTaskWorkMoney() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '绠″緞鏉愯川琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_ProjectMoneyClass.html?openType=2', '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('璇烽�夋嫨鏁版嵁');
+ }
+ var HItemID = checkStatus.data[0].HItemID;
+ //鑾峰彇鏁版嵁
+ getGy_ProjectMoney(4, HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鏍规嵁椤圭洰璐圭敤鍒嗙被杩斿洖杩欎釜鍒嗙被鐨勫��
+ function getGy_ProjectMoney(num, HItemID) {
+ $.ajax({
+ url: GetWEBURL() + '/PM_ProjectBill/getGy_Project',
+ type: "GET",
+ async: false,
+ data: { "HItemID": HItemID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ if (num == 1) {
+ $("#HTaskSetupMoney").val(data[0].HStdMoney)
+ } else if (num == 2) {
+ $("#HTaskOtherMoney").val(data[0].HStdMoney)
+ } else if (num == 3) {
+ $("#HTaskExamMoney").val(data[0].HStdMoney)
+ } else if (num == 4) {
+ $("#HTaskWorkMoney").val(data[0].HStdMoney)
+ }
+ } else {
+ layer.alert(data1.Message, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
+ //#endregion
+
+
+ //浠ヤ笂涓簂ayui妯″潡
+ });
+
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ </script>
+</body>
+</html>
--
Gitblit v1.9.1