From 435d5adcbc83af3877743e2f094447800fd85843 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 05 八月 2021 11:11:48 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 2
WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html | 7
WebTM/views/设备管理/Sb_EquipDotCheckBillList.html | 44 ++--
WebTM/views/PublicPage/UserInformation.html | 29 +-
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 41 ++--
WebTM/views/IpadIndex.html | 2
WebTM/views/PublicPage/CustomerInformation.html | 28 +-
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/ReportHtml.html | 367 ++++++++++++++++++++++++++--------------
9 files changed, 326 insertions(+), 198 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 2c94bd2..591fba0 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
- <History>True|2021-08-03T02:11:46.3635709Z;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2021-08-04T10:04:31.3072954Z;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>08/03/2021 10:11:40</publishTime>
+ <publishTime>08/04/2021 18:04:24</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>08/03/2021 10:11:40</publishTime>
+ <publishTime>08/04/2021 18:04:24</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -623,6 +623,9 @@
<File Include="layuiadmin/PubCustom.js">
<publishTime>07/30/2021 14:36:52</publishTime>
</File>
+ <File Include="layuiadmin/PubJs/PubCheck.js">
+ <publishTime>08/03/2021 10:19:55</publishTime>
+ </File>
<File Include="layuiadmin/Scripts/jquery-1.4.1.js">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
@@ -636,7 +639,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>07/30/2021 14:44:12</publishTime>
+ <publishTime>08/03/2021 10:30:45</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1089,13 +1092,13 @@
<publishTime>07/17/2021 23:58:57</publishTime>
</File>
<File Include="views/IpadIndex.html">
- <publishTime>07/30/2021 23:25:20</publishTime>
+ <publishTime>08/04/2021 11:14:57</publishTime>
</File>
<File Include="views/PublicPage/CheckItemType.html">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="views/PublicPage/CustomerInformation.html">
- <publishTime>06/10/2021 11:10:38</publishTime>
+ <publishTime>08/04/2021 16:51:47</publishTime>
</File>
<File Include="views/PublicPage/DeptInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1140,7 +1143,7 @@
<publishTime>06/22/2021 11:18:06</publishTime>
</File>
<File Include="views/PublicPage/UserInformation.html">
- <publishTime>06/10/2021 11:10:38</publishTime>
+ <publishTime>08/04/2021 16:55:09</publishTime>
</File>
<File Include="views/PublicPage/WareHouseInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1149,7 +1152,7 @@
<publishTime>06/23/2021 15:11:54</publishTime>
</File>
<File Include="views/ReportHtml.html">
- <publishTime>07/28/2021 00:00:10</publishTime>
+ <publishTime>08/03/2021 18:13:11</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1248,7 +1251,7 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="views/user/login.html">
- <publishTime>07/30/2021 14:36:52</publishTime>
+ <publishTime>08/03/2021 10:19:55</publishTime>
</File>
<File Include="views/user/reg.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1482,7 +1485,7 @@
<publishTime>07/29/2021 10:22:22</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html">
- <publishTime>07/30/2021 14:36:52</publishTime>
+ <publishTime>08/03/2021 10:19:55</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1881,7 +1884,7 @@
<publishTime>08/02/2021 13:09:56</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html">
- <publishTime>08/02/2021 14:59:46</publishTime>
+ <publishTime>08/03/2021 12:27:07</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html">
<publishTime>07/13/2021 19:30:07</publishTime>
@@ -1941,13 +1944,13 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>07/30/2021 14:36:52</publishTime>
+ <publishTime>08/04/2021 18:04:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>07/30/2021 14:36:52</publishTime>
+ <publishTime>08/04/2021 18:04:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
- <publishTime>07/30/2021 14:42:20</publishTime>
+ <publishTime>08/04/2021 17:40:11</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇缁勮杩芥函鍗�/Sc_AssemblyBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2025,10 +2028,10 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>08/03/2021 10:11:28</publishTime>
+ <publishTime>08/03/2021 11:24:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
- <publishTime>08/02/2021 11:24:32</publishTime>
+ <publishTime>08/03/2021 12:32:13</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList_PDA.html">
<publishTime>06/29/2021 11:09:03</publishTime>
@@ -2121,10 +2124,10 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillEdit.html">
- <publishTime>08/03/2021 10:11:28</publishTime>
+ <publishTime>08/03/2021 11:24:35</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckBillList.html">
- <publishTime>08/02/2021 11:24:32</publishTime>
+ <publishTime>08/03/2021 12:32:13</publishTime>
</File>
<File Include="views/璁惧绠＄悊/Sb_EquipDotCheckPlanBillEdit.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -2454,7 +2457,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/03/2021 10:11:44</publishTime>
+ <publishTime>08/04/2021 18:04:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index b71b61c..f441a4c 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,10 +1,10 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 419923a..75272cf 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -262,7 +262,7 @@
{
return false;
}
- var HUserName = "Admin";
+ var HUserName = sessionStorage["HUserName"];
var HSourceID = body.find("#HSourceID").val();
var HSourceCode = body.find("#HSourceCode").val();
var HSourceName = body.find("#HSourceName").val();
diff --git a/WebTM/views/PublicPage/CustomerInformation.html b/WebTM/views/PublicPage/CustomerInformation.html
index 5f7ef60..7fa9da4 100644
--- a/WebTM/views/PublicPage/CustomerInformation.html
+++ b/WebTM/views/PublicPage/CustomerInformation.html
@@ -87,7 +87,7 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HUSEORGID = " + sessionStorage["OrganizationID"]+" ";
tree.render({
elem: '#treeCustomer',
@@ -153,10 +153,11 @@
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/CustomerList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +176,10 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/CustomerList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -212,7 +205,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerLoadTree',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
async: false,
success: function (result) {
var data = result.data;
@@ -243,6 +236,17 @@
return treeData;
}
+ function SeachFilter(sWhere) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+ return sWhere;
+ }
</script>
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index 0d9f585..3d7704b 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -87,7 +87,7 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = "";
+ var sWhere = " where HStopFlag=0 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
tree.render({
elem: '#treeUser',
@@ -156,7 +156,7 @@
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -175,18 +175,11 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
- if (HNumber) {
- sWhere += " and HNumber like '%" + HNumber + "%'";
- }
- if (HName) {
- sWhere += " and HName like '%" + HName + "%'";
- }
+
$.ajax({
url: GetWEBURL() + '/PublicPageMethod/UserList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -212,7 +205,7 @@
$.ajax({
url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": SeachFilter(sWhere) },
async: false,
success: function (result) {
var data = result.data;
@@ -243,6 +236,18 @@
return treeData;
}
+ function SeachFilter(sWhere)
+ {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+ return sWhere;
+ }
</script>
diff --git a/WebTM/views/ReportHtml.html b/WebTM/views/ReportHtml.html
index 0a75afb..08c741c 100644
--- a/WebTM/views/ReportHtml.html
+++ b/WebTM/views/ReportHtml.html
@@ -28,17 +28,56 @@
<span>鏇村</span>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartNumber" id="PartNumber" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="PartName" id="PartName" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢熶骇璧勬簮</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Source" id="Source" style="width:190px;">
+ </div>
+ </div>
+
+ </div>
</div>
</div>
<table class="" id="layTable" lay-filter="layTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm" style="display:none;"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back" style="display:none;"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
@@ -65,6 +104,7 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ // #region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -76,131 +116,206 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
- var findTableHead = {
- "success": "true",
- "result": [{ "id":"id","name":"ID"}, { "id":"name","name":"濮撳悕"}, { "id": "sex","name":"鎬у埆"}, { "id": "time","name":"鏃堕棿"}]
- }
- var findTableData = {
- "success": "true",
- "result": {
- "currentPage": 1,
- "pageSize": 10,
- "totalPage": 1,
- "totalSize": 22,
- "list": [{
- "HItemID": "1",
- "HNumber": "PN00000",
- "HName": "鐢�",
- "HRemark": "xxxxx",
- "HUseFlag":"宸蹭娇鐢�",
- "HBirthDay": "2021-02-20 11:00:02"
- }, {
- "HItemID": "1",
- "HNumber": "PN00000",
- "HName": "鐢�",
- "HRemark": "xxxxx",
- "HUseFlag": "宸蹭娇鐢�",
- "HBirthDay": "2021-02-20 11:00:02"
- }]
- }
- }
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill(sWhere);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //#region 澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ switch (obj.event) {
+ //鏂板
+ case 'set_AddNew': set_AddNew();
+ break;
+ //缂栬緫
+ case 'set_ShowBill': set_ShowBill();
+ break;
+ //鍒犻櫎
+ case 'set_DeleteBill': set_DeleteBill();
+ break;
+
+ };
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#endregion
+
+ //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- var resultTableHead = [];
- $.ajax({
- url: GetWEBURL() + '/Sc_MESBeginWorkBill/ReportFrom',
- type: "GET",
- async: false,
- dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
- success: function (data) {
- console.log(data);
- var loaddt = data.list
- for (var key in loaddt) {
-
- resultTableHead.push({ "id": loaddt[key], "name": loaddt[key] });
- }
- }, error: function (err) {
- layer.alert(err.Message, { icon: 5 });
- }
- });
- console.log(resultTableHead);
- //鏌ヨ琛ㄦ牸澶存暟鎹�
-
- var result = findTableHead;
- //console.log(result);//鎵撳嵃鏈嶅姟绔繑鍥炵殑鏁版嵁(璋冭瘯鐢�)
- //濉厖琛ㄦ牸澶存暟缁�
- if (result.success) {
- var data = resultTableHead;
- cols_arr[0] = [];
- cols_arr[0][0] = { checkbox: true, fixed: true };
- for (var i = 0; i < data.length; i++) {
- if (data[i].name == 'id') {
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
- } else if (i == 1) {
- //澧炲姞瓒呴摼鎺�
- var id = data[i].id;
- cols_arr[0][i + 1] = {
- field: data[i].id, title: data[i].name, align: 'center', templet: function (d) {
- return "<div><a href='/detail.do?id=" + eval("d.id") + "' class='layui-table-link'>" + eval("d." + id) + "</a></div>";
- }
- };
- } else {
- cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' };
- }
- }
-
- }
-
-
- //濉厖琛ㄦ牸鏁版嵁
- table.render({
- elem: '#layTable',
- data: findTableData.result.list,
- toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- defaultToolbar: ['filter',],
- title: '鐢ㄦ埛鏁版嵁琛�',
- cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
- page: true, //寮�鍚垎椤�
- id: 'layTable', //琛ㄦ牸id
- parseData: function (result) {
- var data = JSON.parse(result.result);
- //console.log(data.list );
- return {
- "code": 0, // 杩斿洖姝ｇ‘鐨勭姸鎬佺爜鏄�0
- "msg": "",
- "count": data.totalSize,
- "data": data.list
-
- }
- }
- });
-
-
- //閲嶆柊鍔犺浇琛ㄦ牸
- function reloadByKeyword() {
- table.reload('layTable', {
- page: {
- curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
- },
- request: {
- pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
- limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
- },
- where: {
- keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
- }
- });
- }
-
- //鑾峰彇琛ㄦ牸涓殑鍊�
- function batchDel() {
- var data = table.checkStatus('layTable').data;
- var ids = "";
- for (var i = 0; i < data.length; i++) {
- ids += data[i].id + ",";
+ //#region 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HBeginDate'
+ });
+ laydate.render({
+ elem: '#HEndDate'
+ });
}
- alert(ids);
- }
+ //#endregion
+
+ // #region 鍒濆鍖栫晫闈�
+ function set_ClearBill(sWhere)
+ {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(sWhere);
+
+ }
+
+ //#endregion
+
+ //#region 鏌ヨ
+ function get_Display(sWhere)
+ {
+ var ajaxLoad = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
+ type: "GET",
+ data: { "sWhere": sWhere, "page": 1,"limit":10 },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list)
+ {
+ resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
+ }
+ set_InitGrid(sWhere);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ //#endregion
+
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ function set_InitGrid(sWhere)
+ {
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'HItemID') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else
+ {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center'};
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#layTable',
+ url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
+ toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鐢ㄦ埛鏁版嵁琛�',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'layTable', //琛ㄦ牸id
+ where: { sWhere: sWhere}, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: true, //寮�鍚垎椤�
+ limit: 10, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [10, 20, 40, 60,80,100], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+ //endregion
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
+ var PartNumber = $("#PartNumber").val();//鐗╂枡缂栫爜
+ var PartName = $("#PartName").val();//鐗╂枡鍚嶇О
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ if (PartNumber) {
+ sWhere += " and HNumber like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and HName like '%" + PartName + "%'";
+ }
+ if (HBeginDate) {
+ sWhere += " and CONVERT(varchar(100),HBirthDay, 23) >= '" + HBeginDate + "'";
+ }
+ if (HEndDate) {
+ sWhere += " and CONVERT(varchar(100),HBirthDay, 23) <= '" + HEndDate + "'";
+ }
+ set_ClearBill(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#PartNumber").val("");//鐗╂枡缂栫爜
+ $("#PartName").val("");//鐗╂枡鍚嶇О
+ $("#HBeginDate").val("");//寮�濮嬫棩鏈�
+ $("#HEndDate").val("");//缁撴潫鏃ユ湡
+ get_FastQuery();
+ sWhere = "";
+ }
+ //#endregion
+
+ //#endregion
+
+ //#region 閲嶆柊鍔犺浇琛ㄦ牸(澶囩敤鏂规硶)
+ function reloadByKeyword() {
+ table.reload('layTable', {
+ page: {
+ curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
+ },
+ request: {
+ pageName: 'page', //椤电爜鐨勫弬鏁板悕绉帮紝榛樿:page
+ limitName: 'limit'//姣忛〉鏁版嵁閲忕殑鍙傛暟鍚嶏紝榛樿:limit
+ },
+ where: {
+ keyword: $('#demoInput').val() //鍙紶鍙傛煡璇㈢殑鍙傛暟
+ }
+ });
+ }
+ //#endregion
+
+ //#region 鑾峰彇琛ㄦ牸涓殑鍊�(澶囩敤鏂规硶)
+ function batchDel() {
+ var data = table.checkStatus('layTable').data;
+ var ids = "";
+ for (var i = 0; i < data.length; i++) {
+ ids += data[i].id + ",";
+ }
+ alert(ids);
+ }
+ //#endregion
+
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index dd119c4..9de9967 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -29,7 +29,7 @@
<div class="layui-fluid" style="padding: 0;">
<div class="layui-card" style="padding: 15px;">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <form class="layui-form" action="" lay-filter="component-form-group" style="background-color:white;">
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">鏂板</button>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index ffda75e..037ccd2 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -448,6 +448,7 @@
}
})
}
+ //#endregion
//#region 鑾峰彇鏈�澶у崟鎹彿
function get_MAXNum() {
@@ -503,7 +504,8 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HEquipID": data.HEquipID //璁惧
+ , "HEquipID": data.璁惧ID //璁惧ID
+ , "HEquipName": data.璁惧鍚嶇О //璁惧鍚嶇О
, "HExplanation": data.鎽樿 //鎽樿
, "HBeginDate": data.寮�濮嬫棩鏈� // 寮�濮嬫棩鏈�
, "HEndDate": data.缁撴潫鏃ユ湡 // 缁撴潫鏃ユ湡
@@ -530,6 +532,7 @@
type: "GET",
data: { "sqlWhere": "and hmainid=" + linterid },
success: function (result) {
+ console.log(result);
if (result.count == 1) {
option.data = result.data;
table.render(option);
@@ -559,7 +562,7 @@
}
//#endregion
- //#endregion
+
//#endregion
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index e03c053..9492146 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -189,43 +189,41 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { field: 'hmainid', title: 'hmainid', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+ , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 160 }
, { field: '璁惧浠ｇ爜', title: '璁惧浠ｇ爜', width: 200 }
- , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200, hide: true }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200, hide: true }
- , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200 }
- , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200 }
+ , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200}
+ , { field: '寮�濮嬫棩鏈�', title: '寮�濮嬫棩鏈�', width: 200, templet: "<div>{{d.寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
+ , { field: '缁撴潫鏃ユ湡', title: '缁撴潫鏃ユ湡', width: 200, templet: "<div>{{d.缁撴潫鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撴潫鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
, { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
, { field: '鎽樿', title: '鎽樿', width: 200 }
, { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
- , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+ , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 200 }
, { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
, { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
, { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
- , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115, hide: true }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200, hide: true }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 115, hide: true }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, hide: true }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 200 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200, hide: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 115, hide: true }
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200}
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200}
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
, { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
- , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+ , { field: '鍏宠仈閲戦', title: '鍏宠仈閲戦', width: 200 }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
]]
};
}
--
Gitblit v1.9.1