优化F7人员、往来单位通过组织过滤

YL

2021-08-04 3e0b9cacb7c8d31df384072ee4c9757c56d582af

优化F7人员、往来单位通过组织过滤

 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>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,10 +1,10 @@
function 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/";   //凯贝奈特客户服务器

 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();

 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>


 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>


 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 è§¦å‘事件：包括form.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，table ç»„件默认为 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 = "";//调用接口后清空sWhere缓存
            }
            //#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

            //以上是layui模块
        });

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/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>
@@ -775,7 +775,7 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data.h_v_IF_ICMOReportBillList_Edit[0];
                            console.info(data);
                     
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                , "HDate": formatDate(data.日期)

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

@@ -435,7 +435,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产汇报单/Sc_Add_ICMOReportBillList.html?hID=' + hID + '&Type=3'
                        , content: '../生产汇报单/Sc_Add_ICMOReportBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,

 WebTM/views/É豸¹ÜÀí/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


 WebTM/views/É豸¹ÜÀí/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 }
                    ]]
                };
            }