nothing

YL

2021-08-06 041b73dbf0205ed62fa500d9b092be73cf0a1c6d

nothing

 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-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>
    <History>True|2021-08-05T12:09:55.6652746Z;True|2021-08-05T13:13:47.8190054+08:00;True|2021-08-04T18:04:31.3072954+08:00;True|2021-08-04T18:01:18.4681442+08:00;True|2021-08-04T17:56:48.7190175+08:00;True|2021-08-04T17:53:04.7797497+08:00;True|2021-08-04T17:45:31.8566693+08:00;True|2021-08-04T16:55:50.2164076+08:00;True|2021-08-04T16:53:54.3795393+08:00;True|2021-08-04T16:52:12.6890749+08:00;True|2021-08-04T16:45:53.7777474+08:00;True|2021-08-04T16:43:14.6294901+08:00;True|2021-08-03T12:32:28.1751910+08:00;True|2021-08-03T12:29:54.9217779+08:00;True|2021-08-03T12:27:52.8413083+08:00;True|2021-08-03T12:24:19.0709152+08:00;True|2021-08-03T12:23:38.6047116+08:00;True|2021-08-03T12:22:37.1442268+08:00;True|2021-08-03T11:35:32.9861144+08:00;True|2021-08-03T11:17:42.2503866+08:00;True|2021-08-03T11:15:35.2474129+08:00;True|2021-08-03T11:02:29.3376886+08:00;True|2021-08-03T10:31:00.2538243+08:00;True|2021-08-03T10:28:30.8653786+08:00;True|2021-08-03T10:11:46.3635709+08:00;True|2021-08-03T10:09:33.1920064+08:00;True|2021-08-02T14:15:44.7839397+08:00;True|2021-08-02T14:09:49.5590625+08:00;True|2021-08-02T14:08:05.4935142+08:00;True|2021-08-02T14:06:25.6254370+08:00;True|2021-08-02T13:58:43.1021355+08:00;True|2021-08-02T13:13:06.7226632+08:00;True|2021-08-02T13:10:04.6960397+08:00;True|2021-07-30T14:44:28.8697242+08:00;True|2021-07-28T09:57:09.9313268+08:00;True|2021-07-27T15:17:10.8083258+08:00;True|2021-07-27T15:05:09.9773967+08:00;True|2021-07-27T09:23:56.9164989+08:00;True|2021-07-27T08:26:22.4982509+08:00;True|2021-07-21T21:35:22.6454560+08:00;True|2021-07-21T20:41:11.9089851+08:00;True|2021-07-21T20:37:48.9557360+08:00;True|2021-07-21T20:34:51.4886396+08:00;True|2021-07-21T20:26:04.6299920+08:00;True|2021-07-21T20:22:37.4448912+08:00;True|2021-07-21T20:19:38.2099947+08:00;True|2021-07-21T20:16:40.9594972+08:00;True|2021-07-21T20:13:26.9811029+08:00;True|2021-07-21T20:12:21.9556943+08:00;True|2021-07-13T13:57:10.3043513+08:00;True|2021-07-08T15:03:37.6802886+08:00;True|2021-07-08T14:58:11.5470188+08:00;True|2021-07-08T14:44:27.4797393+08:00;True|2021-07-08T12:46:01.7083578+08:00;True|2021-07-08T12:36:41.7875286+08:00;True|2021-07-08T11:34:52.0094686+08:00;True|2021-07-07T19:53:14.0183575+08:00;True|2021-07-07T16:35:37.3175290+08:00;True|2021-07-07T16:17:20.9617488+08:00;True|2021-07-07T16:12:34.1278724+08:00;True|2021-07-07T15:28:05.5862079+08:00;True|2021-07-07T15:27:07.9829390+08:00;True|2021-07-07T15:25:28.0385686+08:00;True|2021-07-07T15:21:11.6178253+08:00;True|2021-07-07T15:15:04.9525528+08:00;True|2021-07-02T17:01:10.6129925+08:00;True|2021-07-02T16:58:31.3382263+08:00;False|2021-07-02T16:56:15.1143571+08:00;True|2021-06-28T14:58:10.7844058+08:00;True|2021-06-28T14:41:22.9103077+08:00;True|2021-06-28T14:38:29.4061991+08:00;True|2021-06-25T14:47:08.0595253+08:00;True|2021-06-25T14:45:23.5681483+08:00;True|2021-06-25T14:42:14.3320293+08:00;True|2021-06-25T14:31:24.4892069+08:00;True|2021-06-25T14:21:27.9305618+08:00;True|2021-06-25T14:01:55.8709557+08:00;True|2021-06-25T14:01:34.2869043+08:00;True|2021-06-25T13:57:16.9235177+08:00;True|2021-06-25T11:04:32.0541037+08:00;True|2021-06-25T10:56:12.6800567+08:00;True|2021-06-25T10:52:39.2232942+08:00;True|2021-06-25T10:46:32.7051515+08:00;True|2021-06-25T10:39:45.9935081+08:00;True|2021-06-24T15:29:05.1557976+08:00;True|2021-06-24T15:17:38.0559722+08:00;True|2021-06-24T15:16:03.4606543+08:00;True|2021-06-24T15:09:30.2350359+08:00;True|2021-06-24T15:08:01.2854904+08:00;True|2021-06-24T09:19:21.8407413+08:00;True|2021-06-23T16:01:06.9752733+08:00;True|2021-06-23T15:40:48.0600942+08:00;True|2021-06-23T15:35:53.3971163+08:00;True|2021-06-23T15:25:06.7153552+08:00;True|2021-06-23T15:17:30.6635532+08:00;True|2021-06-23T15:14:29.9392004+08:00;True|2021-06-23T14:17:00.7593883+08:00;True|2021-06-23T14:15:36.2129408+08:00;True|2021-06-23T14:13:56.0674385+08:00;True|2021-06-23T14:12:39.1152380+08:00;True|2021-06-23T14:11:30.7305862+08:00;True|2021-06-23T14:09:32.9068156+08:00;True|2021-06-23T14:07:14.7921581+08:00;True|2021-06-23T14:04:58.6716794+08:00;True|2021-06-23T14:02:42.0128025+08:00;True|2021-06-23T13:55:52.9751544+08:00;True|2021-06-23T13:53:26.8169698+08:00;True|2021-06-22T16:31:58.5748348+08:00;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="bin/WebTM.dll">
      <publishTime>08/04/2021 18:04:24</publishTime>
      <publishTime>08/05/2021 20:09:48</publishTime>
    </File>
    <File Include="bin/WebTM.pdb">
      <publishTime>08/04/2021 18:04:24</publishTime>
      <publishTime>08/05/2021 20:09:48</publishTime>
    </File>
    <File Include="layuiadmin/config.js">
      <publishTime>06/10/2021 11:10:38</publishTime>
@@ -621,7 +621,7 @@
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="layuiadmin/PubCustom.js">
      <publishTime>07/30/2021 14:36:52</publishTime>
      <publishTime>08/04/2021 19:18:03</publishTime>
    </File>
    <File Include="layuiadmin/PubJs/PubCheck.js">
      <publishTime>08/03/2021 10:19:55</publishTime>
@@ -1098,16 +1098,16 @@
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="views/PublicPage/CustomerInformation.html">
      <publishTime>08/04/2021 16:51:47</publishTime>
      <publishTime>08/05/2021 19:52:16</publishTime>
    </File>
    <File Include="views/PublicPage/DeptInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
      <publishTime>08/05/2021 19:51:29</publishTime>
    </File>
    <File Include="views/PublicPage/EqpInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
    </File>
    <File Include="views/PublicPage/FaultReasonInformation.html">
      <publishTime>07/12/2021 11:10:28</publishTime>
      <publishTime>08/05/2021 20:03:56</publishTime>
    </File>
    <File Include="views/PublicPage/FaultTypeInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1116,10 +1116,10 @@
      <publishTime>06/10/2021 16:31:39</publishTime>
    </File>
    <File Include="views/PublicPage/MouldInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
      <publishTime>08/05/2021 10:02:01</publishTime>
    </File>
    <File Include="views/PublicPage/PartInformation.html">
      <publishTime>07/22/2021 19:47:34</publishTime>
      <publishTime>08/05/2021 19:58:09</publishTime>
    </File>
    <File Include="views/PublicPage/ProductionOrder.html">
      <publishTime>07/08/2021 20:52:36</publishTime>
@@ -1137,16 +1137,16 @@
      <publishTime>06/17/2021 14:49:09</publishTime>
    </File>
    <File Include="views/PublicPage/SupplierInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
      <publishTime>08/05/2021 19:51:06</publishTime>
    </File>
    <File Include="views/PublicPage/UnitInformation.html">
      <publishTime>06/22/2021 11:18:06</publishTime>
      <publishTime>08/05/2021 20:02:31</publishTime>
    </File>
    <File Include="views/PublicPage/UserInformation.html">
      <publishTime>08/04/2021 16:55:09</publishTime>
      <publishTime>08/05/2021 19:51:48</publishTime>
    </File>
    <File Include="views/PublicPage/WareHouseInformation.html">
      <publishTime>06/10/2021 11:10:38</publishTime>
      <publishTime>08/05/2021 19:51:37</publishTime>
    </File>
    <File Include="views/PublicPage/WareLocationInformation.html">
      <publishTime>06/23/2021 15:11:54</publishTime>
@@ -1485,7 +1485,7 @@
      <publishTime>07/29/2021 10:22:22</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Add_Edit_Gy_Source.html">
      <publishTime>08/03/2021 10:19:55</publishTime>
      <publishTime>08/04/2021 19:18:03</publishTime>
    </File>
    <File Include="views/基础资料/生产基础资料/Gy_BadReason.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -1944,13 +1944,13 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>08/04/2021 18:04:14</publishTime>
      <publishTime>08/04/2021 19:18:03</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">
      <publishTime>08/04/2021 18:04:14</publishTime>
      <publishTime>08/04/2021 19:18:03</publishTime>
    </File>
    <File Include="views/生产管理/生产汇报单/Sc_ICMOReportBillList.html">
      <publishTime>08/04/2021 17:40:11</publishTime>
      <publishTime>08/04/2021 19:13:55</publishTime>
    </File>
    <File Include="views/生产管理/生产组装追溯单/Sc_AssemblyBillList.html">
      <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2457,7 +2457,7 @@
      <publishTime>06/10/2021 11:10:39</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/04/2021 18:04:29</publishTime>
      <publishTime>08/05/2021 20:09:53</publishTime>
    </File>
  </ItemGroup>
</Project>

 WebTM/views/PublicPage/CustomerInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"]+" ";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeCustomer',
@@ -157,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -179,7 +180,7 @@
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/CustomerList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere) },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -192,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -205,7 +206,7 @@
            $.ajax({
                url: GetWEBURL() + '/Gy_MaintenanceMode/CustomerLoadTree',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": sWhere },
                async: false,
                success: function (result) {
                    var data = result.data;
@@ -236,16 +237,16 @@
            return treeData;
        }

        function SeachFilter(sWhere) {
        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere;
            return sWhere1;
        }

    </script>

 WebTM/views/PublicPage/DeptInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeDepartment',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/DeptList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,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/DeptList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/PartInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treePart',
@@ -157,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/PartList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -176,18 +177,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/PartList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -244,6 +238,17 @@
            return treeData;
        }

        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }

    </script>


 WebTM/views/PublicPage/SupplierInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeSupplier',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/SupplierList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,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/SupplierList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/UnitInformation.html

@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeUnit',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/UnitList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +176,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/UnitList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +237,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/PublicPage/UserInformation.html

@@ -33,7 +33,7 @@
                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
                                            <div id="treeUser" lay-filter="treeUser" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                        </div>
                                        <div class="layui-col-xs9 layui-inline">
                                        <div class="layui-col-xs9 layui-inline" style="width: 74%;">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">代码</label>
@@ -87,7 +87,8 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = " where HStopFlag=0  and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";
            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeUser',
@@ -156,7 +157,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/UserList',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -179,7 +180,7 @@
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/UserList',
                    type: "GET",
                    data: { "sWhere": SeachFilter(sWhere) },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -192,7 +193,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -205,7 +206,7 @@
            $.ajax({
                url: GetWEBURL() + '/Gy_MaintenanceMode/UserLoadTree',
                type: "GET",
                data: { "sWhere": SeachFilter(sWhere) },
                data: { "sWhere": sWhere },
                async: false,
                success: function (result) {
                    var data = result.data;
@@ -236,17 +237,17 @@
            return treeData;
        }

        function SeachFilter(sWhere)
        function SeachFilter(sWhere1)
        {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere += " and HNumber like '%" + HNumber + "%'";
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere += " and HName like '%" + HName + "%'";
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere;
            return sWhere1;
        }

    </script>

 WebTM/views/PublicPage/WareHouseInformation.html

@@ -87,7 +87,9 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            var sWhere = "";

            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //树型
            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //列表

            tree.render({
                elem: '#treeWareHouse',
@@ -156,7 +158,7 @@
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/WareHouseList',
                type: "GET",
                data: { "sWhere": sWhere },
                data: { "sWhere": SeachFilter(sWhere1) },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
@@ -175,18 +177,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/WareHouseList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    data: { "sWhere": SeachFilter(sWhere1) },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -199,7 +194,7 @@
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
                sWhere1 = "";//调用接口后清空sWhere缓存
            });

            //以上是layui模块
@@ -243,7 +238,17 @@
            return treeData;
        }


        function SeachFilter(sWhere1) {
            var HNumber = $("#HNumber").val();
            var HName = $("#HName").val();
            if (HNumber) {
                sWhere1 += " and HNumber like '%" + HNumber + "%'";
            }
            if (HName) {
                sWhere1 += " and HName like '%" + HName + "%'";
            }
            return sWhere1;
        }
    </script>

</body>

 WebTM/views/ReportHtml.html

@@ -198,9 +198,10 @@
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
                        console.log(data1);
                        for (var key in data1.list)
                        {
                            resultTableHead.push({ "id": data1.list[key], "name": data1.list[key] });
                            resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                        }
                        set_InitGrid(sWhere);
                    }, error: function (err) {
@@ -217,26 +218,39 @@
                //填充表格头数组
                var data = resultTableHead;
                cols_arr[0] = [];
                cols_arr[0][0] = { checkbox: true, fixed: true };
                cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '合计' };
                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'};
                        switch (data[i].Type)
                        {
                            //int
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true ,sort: true};
                                break;
                            //Decimal
                            case 'Decimal': 
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true};
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center' ,sort: true};
                        }
                    }
                }
                //填充表格数据
                table.render({
                    elem: '#layTable',
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportFromBillList',
                    toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    //toolbar: '#toolbarDemo', //开启头部工具栏，并为其绑定左侧模板
                    title: '用户数据表',
                    cols: cols_arr,    //填充表格头数据,
                    id: 'layTable', //表格id
                    where: { sWhere: sWhere}, //扩展参数,可以传数据到后台
                    page: true,   //开启分页
                    totalRow: true, //开启合计
                    limit: 10,     //一页能够显示的最大数目
                    limits: [10, 20, 40, 60,80,100], //控制多少行一页（默认五条一页）
                    method: 'get',  //提交方式

 WebTM/views/Éú²ú¹ÜÀí/²úÁ¿»ã±¨µ¥/Sc_ProductReportBillList.html

@@ -285,7 +285,7 @@
                    {
                        type: "GET",
                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //方法所在页面和方法名
                        async: false,
                        async: true,
                        data: { "ScMaxWork": ScMaxWork(), "HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker, "Czybm": Czybm },
                        dataType: "json",
                        beforeSend: function () {
@@ -293,6 +293,7 @@
                        },
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                                layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                    layer.close(layer.index);
                                    window.parent.location.reload();
@@ -300,10 +301,12 @@
                            }
                            else {
                               layer.alert(data.Message, { icon: 5 })
                                $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                            }
                        },
                        error: function (err) {
                            layer.alert(data.Message, { icon: 5 })
                            $('#AskReport').removeClass("layui-btn-disabled").attr("disabled", false);
                        }
                    });
            })