From 073aca8ebc3f025a3b1678a0fb83a697276561a5 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 20 八月 2021 15:23:32 +0800
Subject: [PATCH] 合并

---
 WebTM/views/Baseset/基础资料/Sc_ICMOBillListView.html           |    2 
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckPlanBillList.html   |  392 
 WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html       |  348 
 WebTM/views/PublicPage/CheckItemInformation.html            |  254 
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html              |  413 
 WebTM/views/质量管理/检验方案单/QC_CheckProjectList.html             |  551 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html      |  348 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html                |   14 
 WebTM/views/生产管理/生产停工单/Sc_MESStopWorkBillList.html          |  547 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_QCCheckClass.html       |   11 
 WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html   | 3034 ++------
 WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html     |  430 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html         |  390 
 WebTM/views/PublicPage/Gy_Maintain.html                     |  254 
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainPlanBillList.html   |  413 
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html              |  787 +
 WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html       |  466 
 WebTM/views/设备管理/Sb_EqpMaintenanceBillList.html             |  461 
 WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html          |  228 
 WebTM/views/设备管理/Sb_EquipDotCheckPlanBillList.html          |  410 
 WebTM/views/模治具管理/模治具管理/Sc_MouldDotCheckBillList.html       |  403 
 WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html        |  180 
 WebTM/layuiadmin/Scripts/webConfig.js                       |    1 
 WebTM/views/模治具管理/模治具管理/Sb_MouldRepairWorkBillList.html     |  601 +
 WebTM/views/领料发货/委外出库/Kf_EntrustOutBill_Fast.html           |    8 
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html                   |  453 +
 WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html          |   80 
 WebTM/WebTM.csproj                                          |    6 
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillList.html          |  410 
 WebTM/views/基础资料/公用基础资料/Gy_QCCheckClass.html                |  503 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           | 1628 ++--
 WebTM/views/IpadIndex.html                                  |   10 
 WebTM/views/生产管理/生产完工单/Sc_MESEndWorkBillList.html           |  509 
 WebTM/views/home/console.html                               |   30 
 WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html      |  324 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_CheckItem.html          |    2 
 WebTM/layuiadmin/layui/css/ReportPlatform.css               |    2 
 WebTM/views/index.html                                      |   50 
 WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList_Web.html    |  538 +
 WebTM/views/质量管理/检验方案单/QC_Add_CheckProject.html             | 3037 +-------
 WebTM/layuiadmin/PubCustom.js                               |    2 
 WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html         |  497 
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html |  376 
 WebTM/views/PublicPage/UserInformation.html                 |    1 
 WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html    |  421 
 WebTM/views/PublicPage/DeptInformation.html                 |    2 
 WebTM/views/PublicPage/UnitInformation.html                 |    4 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html          |  255 
 WebTM/views/PublicPage/Gy_MaterType.html                    |  254 
 WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html                 |   36 
 50 files changed, 10,256 insertions(+), 10,120 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index a30560f..1cd30f5 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -9,1225 +9,1228 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="bin/layuiadmin/style/admin.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="bin/layuiadmin/style/login.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>08/03/2021 10:26:37</publishTime>
+      <publishTime>08/18/2021 17:11:09</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>08/03/2021 10:26:37</publishTime>
+      <publishTime>08/18/2021 17:11:09</publishTime>
     </File>
     <File Include="layuiadmin/config.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/echarts.min.js">
-      <publishTime>07/02/2021 17:32:48</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/console/prograss.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/console/top-card.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/console/top-search.js">
-      <publishTime>05/16/2021 15:22:32</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/content/comment.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/content/list.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/content/tags.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/forum/list.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/forum/replys.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/layer/photos.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/layim/getList.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/layim/getMembers.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/mall/order.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/menu.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/menu1.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/message/all.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/message/detail.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/message/direct.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/message/new.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/message/notice.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/table/demo.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/table/demo2.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/table/demo3.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/table/user.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/table/user30.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/Test.json">
-      <publishTime>07/02/2021 17:32:48</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/upload/demo.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/forget.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/login.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/logout.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/reg.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/resetpass.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/session.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/user/sms.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/useradmin/mangadmin.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/useradmin/role.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/useradmin/webuser.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/workorder/demo.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/json/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/global.css">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/layui.css">
-      <publishTime>04/22/2021 02:01:18</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/layui.mobile.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/code.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/laydate/default/font.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/laydate/default/laydate.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/icon-ext.png">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/icon.png">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/layer.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/loading-0.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/loading-1.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layer/default/loading-2.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/html/chatlog.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/html/find.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/html/getmsg.json">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/html/msgbox.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/layim.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/mobile/layim.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/1.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/2.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/3.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/4.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/5.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/skin/logo.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/modules/layim/voice/default.mp3">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/ReportPlatform.css">
-      <publishTime>07/19/2021 15:36:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/css/zgqlayui.css">
-      <publishTime>04/22/2021 02:01:18</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/font/iconfont.eot">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/font/iconfont.svg">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/font/iconfont.ttf">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/font/iconfont.woff">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/font/iconfont.woff2">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/device.png">
-      <publishTime>07/19/2021 15:36:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/erro.png">
-      <publishTime>07/02/2021 17:32:48</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/0.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/1.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/10.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/11.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/12.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/13.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/14.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/15.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/16.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/17.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/18.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/19.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/2.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/20.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/21.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/22.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/23.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/24.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/25.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/26.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/27.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/28.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/29.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/3.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/30.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/31.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/32.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/33.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/34.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/35.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/36.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/37.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/38.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/39.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/4.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/40.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/41.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/42.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/43.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/44.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/45.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/46.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/47.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/48.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/49.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/5.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/50.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/51.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/52.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/53.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/54.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/55.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/56.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/57.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/58.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/59.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/6.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/60.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/61.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/62.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/63.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/64.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/65.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/66.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/67.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/68.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/69.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/7.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/70.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/71.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/8.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/images/face/9.gif">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/all-mobile.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/all.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/carousel.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/code.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/colorpicker.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/element.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/flow.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/form.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/jquery.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/laydate.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/layedit.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/layer.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/layim.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/laypage.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/laytpl.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile/layer-mobile.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile/layim-mobile-open.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile/layim-mobile.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile/upload-mobile.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/mobile/zepto.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/rate.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/slider.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/table.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/tree.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/upload.js">
-      <publishTime>05/31/2021 11:06:08</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/lay/modules/util.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/layui.all.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/layui.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/layui/zgqlayui.js">
-      <publishTime>04/22/2021 02:01:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/lib/admin.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/lib/extend/echarts.js">
-      <publishTime>03/25/2021 13:26:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/lib/extend/echartsTheme.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/lib/index.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/lib/view.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/common.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/console.js">
-      <publishTime>05/16/2021 15:20:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/contlist.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/forum.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/im.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/message.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/sample.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/senior.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/set.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/user.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/useradmin.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/modules/workorder.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/win.svg">
-      <publishTime>05/08/2021 12:32:19</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/yidongduan.svg">
-      <publishTime>05/08/2021 12:27:41</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/淇敼瀵嗙爜.svg">
-      <publishTime>05/08/2021 13:12:27</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/鍗曟嵁褰曞埗.svg">
-      <publishTime>05/08/2021 12:43:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/鎴戠殑璁剧疆.svg">
-      <publishTime>05/08/2021 13:10:10</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/绯荤粺璁剧疆.svg">
-      <publishTime>05/08/2021 13:04:27</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/myicon/杞﹂棿绠$悊.svg">
-      <publishTime>05/08/2021 12:57:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/PubCustom.js">
-      <publishTime>08/03/2021 10:47:54</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/PubJs/PubCheck.js">
-      <publishTime>07/30/2021 16:58:34</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/jquery-1.4.1.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/jquery-1.4.1.min.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/jquery-3.5.1.min.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/json2.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>08/05/2021 13:45:42</publishTime>
+      <publishTime>08/17/2021 09:23:38</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/login.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/bg-none.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/layui-logo.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/logo-black.png">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/logo.png">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/template/character.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/template/huge.jpg">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/res/template/portrait.png">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/style/template.css">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/timeFormat/timeFormat.js">
       <publishTime>03/23/2021 14:14:38</publishTime>
     </File>
     <File Include="layuiadmin/tpl/layim/demo.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/system/about.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/system/get.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/system/more.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/system/theme.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/system/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/tpl/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/treeTable.js">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="layuiadmin/zgqCustom/zgqCustom.js">
-      <publishTime>05/10/2021 09:21:41</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/comment.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/contform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/listform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/tags.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/content/tagsform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/forum/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/forum/listform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/forum/replys.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/forum/replysform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/mall/category.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/mall/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/mall/specs.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/message/detail.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/message/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/workorder/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/workorder/listform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/app/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/HBarPlanPrint.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/SRM_OpenTmpList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_CheckItemList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html">
-      <publishTime>07/22/2021 17:04:55</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_CustomerList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html">
-      <publishTime>07/22/2021 17:05:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_DormList.html">
-      <publishTime>07/22/2021 17:03:43</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_DutyList.html">
-      <publishTime>07/22/2021 16:58:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html">
-      <publishTime>07/22/2021 17:06:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html">
-      <publishTime>07/29/2021 16:33:40</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ModulList.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_PostList.html">
-      <publishTime>07/22/2021 17:05:41</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ProcList.html">
-      <publishTime>07/22/2021 22:48:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_QCCheckItemListView.html">
-      <publishTime>07/19/2021 19:30:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_QCCheckProjectListView.html">
-      <publishTime>07/20/2021 21:27:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_RepairList.html">
-      <publishTime>06/30/2021 11:17:08</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_ScrapReasonList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_StockPlaceList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_UnitList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html">
-      <publishTime>07/23/2021 17:12:47</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html">
-      <publishTime>07/22/2021 17:04:31</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html">
-      <publishTime>07/19/2021 20:55:37</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView2.html">
-      <publishTime>07/19/2021 19:22:26</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ProcessExchangeBillListView.html">
-      <publishTime>07/19/2021 16:02:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Baseset/鍩虹璧勬枡/WMSBarCodeDetailsList.html">
-      <publishTime>07/06/2021 17:08:14</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/anim/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/auxiliar/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/badge/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/button/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/carousel/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/code/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/colorpicker/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/flow/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/form/element.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/form/group.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/all.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/mobile-pc.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/mobile.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/speed-dial.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/grid/stack.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laydate/demo1.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laydate/demo2.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laydate/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laydate/special-demo.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laydate/theme.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/layer/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/layer/special-demo.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/layer/theme.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laypage/demo1.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laypage/demo2.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laypage/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/laytpl/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/nav/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/panel/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/progress/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/rate/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/slider/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/auto.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/cellEdit.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/cellEvent.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/checkbox.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/data.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/fixed.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/form.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/height.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/initSort.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/onrow.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/operate.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/page.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/parseData.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/radio.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/reload.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/resetPage.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/simple.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/static.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/style.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/thead.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/toolbar.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/tostatic.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/table/totalRow.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/tabs/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/temp.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/timeline/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/upload/demo1.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/upload/demo2.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/upload/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/util/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/component/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/CreateControl.js">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/grf/123.txt">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/grf/a.grf">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/grf/b.grf">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/grf/b1.grf">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/GRInstall.js">
-      <publishTime>04/25/2021 16:20:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/GRUtility.js">
-      <publishTime>04/25/2021 16:20:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/home/console.html">
-      <publishTime>07/06/2021 16:01:53</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/home/console_Mobile.html">
-      <publishTime>07/20/2021 23:24:03</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/home/homepage1.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/home/homepage2.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/home/menu.html">
       <publishTime>07/05/2021 15:05:53</publishTime>
     </File>
     <File Include="views/iframe/layer/iframe.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/index-copy.html">
-      <publishTime>07/12/2021 15:38:26</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/index.html">
-      <publishTime>07/23/2021 17:13:51</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/index_Mobile.html">
-      <publishTime>07/16/2021 17:40:57</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/IpadIndex.html">
-      <publishTime>08/05/2021 10:54:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/CheckItemType.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/CustomerInformation.html">
-      <publishTime>08/05/2021 10:54:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/DeptInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/18/2021 09:28:40</publishTime>
     </File>
     <File Include="views/PublicPage/EqpInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/FaultReasonInformation.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/FaultTypeInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/GroupInformation.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
+    </File>
+    <File Include="views/PublicPage/Gy_Maintain.html">
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/PublicPage/MouldInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/PartInformation.html">
-      <publishTime>07/23/2021 17:13:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/ProductionOrder.html">
-      <publishTime>07/12/2021 15:38:26</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/PropertyInformation.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/RepairCheckItemInformation.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/RepairItemInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/SourceInformation.html">
-      <publishTime>06/18/2021 09:38:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/SupplierInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/UnitInformation.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/UserInformation.html">
-      <publishTime>08/05/2021 10:54:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/WareHouseInformation.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/PublicPage/WareLocationInformation.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/ReportHtml.html">
-      <publishTime>08/05/2021 10:54:39</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/senior/echarts/bar.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/senior/echarts/line.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/senior/echarts/map.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/senior/im/index.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/senior/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/set/system/email.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/set/system/website.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/set/user/info.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/set/user/password.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/set/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/system/about.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/system/get.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/system/more.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/system/theme.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/system/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/addresslist.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/caller.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/goodslist.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/msgboard.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/personalpage.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/search.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/temp.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/tips/404.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/tips/error.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/template/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/Test/qrscan.js">
       <publishTime>03/23/2021 14:14:38</publishTime>
@@ -1236,1228 +1239,1237 @@
       <publishTime>03/23/2021 14:14:38</publishTime>
     </File>
     <File Include="views/user/administrators/adminform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/administrators/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/administrators/role.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/administrators/roleform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/forget.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/login.html">
-      <publishTime>08/02/2021 16:08:00</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/reg.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/user/list.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/user/userform.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/user/璇存槑.txt">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/userfiles/images/2.jpg">
-      <publishTime>03/25/2021 13:26:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/userfiles/images/login_BackgroundImage.jpg">
-      <publishTime>05/14/2021 13:45:26</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/userfiles/images/2.jpg">
-      <publishTime>03/25/2021 13:26:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/userfiles/images/login_BackgroundImage.jpg">
-      <publishTime>05/14/2021 13:45:26</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/涓嶈壇姹囨姤/Xs_SeOrderPickUp.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html">
-      <publishTime>03/29/2021 10:46:35</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_LookingForBillList.html">
-      <publishTime>03/29/2021 10:46:43</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
-      <publishTime>07/16/2021 17:40:57</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html">
-      <publishTime>03/29/2021 10:47:31</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_UpMoveStockBill.html">
-      <publishTime>03/29/2021 10:48:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍝佽川绠$悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html">
-      <publishTime>07/22/2021 20:54:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Material.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/grf/b.grf">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍝佽川绠$悊/鎴愬搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_CheckItem.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Currency.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html">
-      <publishTime>07/22/2021 20:54:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_Unit.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department_Edit.html">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee.html">
-      <publishTime>07/22/2021 17:01:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EquipMent_Edit.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
+    </File>
+    <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
+      <publishTime>08/17/2021 15:54:20</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit - 澶嶅埗.html">
       <publishTime>05/24/2021 10:08:23</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_QCCheckClass.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_StockPlace.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit - 澶嶅埗.html">
       <publishTime>05/24/2021 10:08:23</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
-      <publishTime>07/22/2021 17:46:18</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
-      <publishTime>05/09/2021 23:57:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Department_Edit.aspx">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Material.aspx">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse_Edit.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html">
-      <publishTime>07/22/2021 17:46:18</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/HBarPlanPrint.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/test.html">
-      <publishTime>05/09/2021 23:57:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/xmlLBM_Gy_Department_Edit.aspx">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html">
-      <publishTime>07/30/2021 16:57:22</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html">
-      <publishTime>08/03/2021 10:40:34</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_BadReason.html">
-      <publishTime>05/29/2021 15:26:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Source.html">
-      <publishTime>08/03/2021 09:44:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessDetail.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/H_ProcessList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Gy_MaintenanceAcceptItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Gy_MaintenanceItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Sb_Add_MaintenanceAcceptItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Sb_Add_MaintenanceItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/杈呭姪鍩虹璧勬枡/Gy_MaintenanceMode.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/杈呭姪鍩虹璧勬枡/Sb_Add_MaintenanceMode.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Gy_MaintenanceAcceptItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Gy_MaintenanceItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Sb_Add_MaintenanceAcceptItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/璁惧鍩虹璧勬枡/Sb_Add_MaintenanceItem.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/杈呭姪鍩虹璧勬枡/Gy_MaintenanceMode.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/杈呭姪鍩虹璧勬枡/Sb_Add_MaintenanceMode.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html">
-      <publishTime>03/29/2021 10:48:22</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鎶ュ伐骞冲彴/ReportPlatform.html">
       <publishTime>07/01/2021 13:15:12</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍏ュ簱鍗�/Sc_MouldOtherInBill_PDA.html">
-      <publishTime>06/29/2021 10:20:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鍏朵粬鍑哄簱鍗�/Sc_MouldOtherOutBill_PDA.html">
-      <publishTime>06/29/2021 10:18:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿澶勭悊鍑哄簱鍗�/Sc_MouldScrapOutBill_PDA.html">
-      <publishTime>07/14/2021 13:14:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿瀵垮懡璋冩暣鍗�/Sc_MouldLifeChangeBill_PDA.html">
-      <publishTime>06/30/2021 16:53:05</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html">
-      <publishTime>07/14/2021 13:14:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html">
-      <publishTime>07/14/2021 13:14:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html">
-      <publishTime>06/30/2021 13:43:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
-      <publishTime>06/18/2021 16:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
-      <publishTime>06/18/2021 09:38:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBill_PDA.html">
-      <publishTime>06/28/2021 15:13:43</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldDotCheckBill_PDA.html">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风偣妫�淇濆吇/Sc_MouldMaintainBill_PDA.html">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_CheckToolsFileMainList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/19/2021 08:36:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/17/2021 17:40:35</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsDotCheckBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsDotCheckPlanBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsMaintainBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsMaintainPlanBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsRepairCheckBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldLifeChangeBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdBackBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldProdOutBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapInBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_Add_MouldScrapOutBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldLifeChangeBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillEdit.html">
-      <publishTime>06/18/2021 16:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldOtherOutBillList.html">
-      <publishTime>06/18/2021 09:38:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdBackBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldProdOutBillList.html">
-      <publishTime>06/15/2021 16:41:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapInBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏蜂粨搴撶鐞�/Sc_MouldScrapOutBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_BarCodeBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_CheckToolsFileMainList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/19/2021 08:36:02</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/17/2021 17:40:35</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldConkBookBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>06/09/2021 13:43:29</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldRepairCheckBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsConkBookBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsDotCheckBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsDotCheckPlanBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsMaintainBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsMaintainPlanBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsRepairCheckBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_CheckToolsRepairWorkBillList.html">
-      <publishTime>04/08/2021 09:14:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldConkBookBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBill.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldRepairCheckBillList.html">
-      <publishTime>07/14/2021 13:25:04</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/澧炲姞涓嶈壇璇勫鍗�/QC_NoPassProdCheckBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ崟/WW_EntrustWorkOrderBillMainList.html">
-      <publishTime>05/06/2021 19:55:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ崟/WW__Add_EntrustWorkOrderBill.html">
-      <publishTime>05/16/2021 16:49:31</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭姹囨姤鍗�/Sc_StationOutBillMainList.html">
       <publishTime>03/29/2021 08:48:21</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_AddEntrustProcSendWork.html">
-      <publishTime>05/06/2021 19:55:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭娲惧伐鍗�/WW_EntrustProcSendWorkBillList.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_Add_EntrustProcessReport.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReportBillList.html">
-      <publishTime>05/08/2021 13:16:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝姹囨姤鍗�/WW_EntrustProcessReport_PDA.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_Add_EntrustProcessSendOutBill.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBillList.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/濮斿宸ュ簭璁″垝杞嚭鍗�/WW_EntrustProcessSendOutBill_PDA.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html">
-      <publishTime>05/06/2021 17:40:06</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/xmlLBM_ProcessReport.aspx">
-      <publishTime>04/25/2021 16:20:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
-      <publishTime>05/06/2021 19:55:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReport_PDA.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/xmlLBM_ProcessReport.aspx">
-      <publishTime>04/25/2021 16:20:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
-      <publishTime>05/06/2021 19:55:58</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
-      <publishTime>05/10/2021 09:29:11</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇宸ュ簭绠$悊/宸ュ簭璁″垝鍗�/Sc_ProcessPlanList.html">
-      <publishTime>06/24/2021 16:58:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html">
-      <publishTime>07/30/2021 16:57:22</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html">
-      <publishTime>08/03/2021 15:03:31</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
+    </File>
+    <File Include="views/鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鎶ュ伐骞冲彴鍔熻兘椤�/LineBind.html">
-      <publishTime>07/19/2021 15:36:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList - 澶嶅埗.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇涓婃枡鍗�/Sc_MaterToSourceBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList - 澶嶅埗.html">
-      <publishTime>07/19/2021 15:36:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_MESStopWorkBillList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList - 澶嶅埗.html">
-      <publishTime>07/19/2021 15:36:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList - 澶嶅埗.html">
-      <publishTime>07/19/2021 15:36:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
-      <publishTime>07/23/2021 17:13:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_MESStopWorkBillList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">
-      <publishTime>07/22/2021 14:22:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">
-      <publishTime>06/28/2021 11:17:20</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html">
-      <publishTime>07/27/2021 12:05:28</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">
-      <publishTime>07/23/2021 17:13:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇鎶曟枡鍗�/Sc_PPBomBillList.html">
-      <publishTime>03/29/2021 10:46:21</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
-      <publishTime>08/05/2021 12:34:37</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
-      <publishTime>08/05/2021 12:34:37</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
-      <publishTime>08/04/2021 16:11:09</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇缁勮杩芥函鍗�/Sc_AssemblyBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/鐢熶骇璐ㄩ噺姹囨姤鍗�/Sc_QualityReportBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/鐢熶骇绠$悊/缁勮鍗�/Sc_GroupOrderBillList.html">
-      <publishTime>06/22/2021 14:19:35</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriodList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/浼氳鏈熼棿/Xt_AccountPeriod_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillTypeList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鍗曟嵁绫诲瀷/Xt_BillType_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鏃ュ織绠$悊/Xt_SystemLogList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/妯″潡绠$悊/Xt_XtgnbList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/妯″潡绠$悊/Xt_Xtgnb_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserGroupList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/鐢ㄦ埛绠$悊/Xt_UserList.html">
-      <publishTime>04/29/2021 16:21:52</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/绯荤粺鍙傛暟绠$悊/Xt_SystemParameterList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/绯荤粺绠$悊/绯荤粺鍙傛暟绠$悊/Xt_SystemParameter_Edit.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/缁勮鍗�/Sc_AssemblyBill_Fast.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>05/14/2021 09:40:07</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBill.html">
-      <publishTime>05/14/2021 09:40:07</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁″垝绠$悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/19/2021 08:30:01</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpMaintenanceBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/17/2021 11:12:40</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpMaintenanceBillList_PDA.html">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpRepairCheckBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>08/05/2021 10:54:39</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList.html">
-      <publishTime>08/05/2021 10:54:39</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList_PDA.html">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList_PDA.html">
-      <publishTime>06/30/2021 15:46:02</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBill.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
-      <publishTime>07/21/2021 20:10:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill-X.html">
-      <publishTime>07/19/2021 08:17:34</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>07/27/2021 12:02:19</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpConkBookBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/19/2021 08:30:01</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_Add_EqpRepairCheckBillList.html">
-      <publishTime>07/13/2021 17:09:13</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpConkBookBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpMaintenanceBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/17/2021 11:12:40</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EqpRepairCheckBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">
-      <publishTime>08/05/2021 10:54:39</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckBillList.html">
-      <publishTime>08/05/2021 10:54:39</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璁惧绠$悊/Sc_Add_MouldDotCheckBillList.html">
-      <publishTime>06/09/2021 13:43:30</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBill.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/浜у搧鍏ュ簱妫�楠屽崟/QC_LastPieceCheckBillList.html">
-      <publishTime>07/02/2021 09:07:44</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鍑哄巶妫�楠屽崟/QC_OutCompCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckBill.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸℃璁板綍鍗�/QC_PatrolProcCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html">
-      <publishTime>07/21/2021 20:10:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/宸ュ簭妫�楠屽崟/QC_ProcessCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_Add_Edit_POStockInCheckBill.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/鏉ユ枡妫�楠屽崟/QC_POStockInCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_Add_CheckProject.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/妫�楠屾柟妗堝崟/QC_CheckProjectList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html">
-      <publishTime>07/27/2021 12:02:19</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/璐ㄩ噺绠$悊/棣栦欢妫�楠屽崟/QC_FirstPieceCheckBillList.html">
-      <publishTime>05/24/2021 10:08:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/涓嶈壇鍝佽瘎瀹″崟/Cj_NoPassProcList.html">
-      <publishTime>03/29/2021 10:48:22</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill.html">
-      <publishTime>07/19/2021 16:05:34</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBillList.html">
-      <publishTime>07/16/2021 14:22:40</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鍙戝嚭鍗�/Cj_StationEntrustInBill_PDA.html">
-      <publishTime>05/10/2021 10:30:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill.html">
-      <publishTime>07/19/2021 16:05:46</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBillList.html">
-      <publishTime>07/16/2021 14:34:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/濮斿宸ュ簭鎺ユ敹鍗�/Cj_StationEntrustOutBill_PDA.html">
-      <publishTime>05/10/2021 10:30:53</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html">
-      <publishTime>08/04/2021 14:55:45</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBillList.html">
-      <publishTime>07/21/2021 19:56:35</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill.html">
-      <publishTime>07/07/2021 10:49:01</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBillList.html">
-      <publishTime>04/20/2021 09:55:40</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationInBill_PDA.html">
-      <publishTime>05/08/2021 09:52:07</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill.html">
-      <publishTime>07/07/2021 10:52:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBillList.html">
-      <publishTime>03/29/2021 10:48:22</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆/MES_StationOutBill_PDA.html">
-      <publishTime>05/08/2021 09:52:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
-      <publishTime>07/19/2021 10:48:55</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
-      <publishTime>06/22/2021 15:08:26</publishTime>
+      <publishTime>08/17/2021 18:34:10</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill_loser.html">
       <publishTime>05/17/2021 19:07:00</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
-      <publishTime>07/21/2021 21:55:36</publishTime>
+      <publishTime>08/18/2021 17:18:58</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/22/2021 15:25:54</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html">
-      <publishTime>07/21/2021 21:55:36</publishTime>
+      <publishTime>08/18/2021 17:18:58</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBillList.html">
-      <publishTime>07/22/2021 15:25:54</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Qk_OutProcessList.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_ProductionProcessDetailsReport.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/鎶ヨ〃鍒嗘瀽/Sc_WorkShopReport.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>07/05/2021 14:20:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/濮斿璁㈠崟/WW_EntrustOrderBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閲囪喘绠$悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
-      <publishTime>07/05/2021 14:20:12</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閫�璐ч�氱煡鍗�/Xs_SeOutStockBackBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/閿�鍞鐞�/閿�鍞鍗�/Xs_SeOrderBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_Fast.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBackBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html">
-      <publishTime>07/20/2021 17:07:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBackBill_Fast.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBackBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
-      <publishTime>07/19/2021 15:36:51</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_Fast.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBackBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html">
-      <publishTime>07/14/2021 13:14:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_Fast.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBackBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_Fast.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/棰嗘枡鍑哄簱/Kf_MateOutBill_FastList.html">
-      <publishTime>03/29/2021 10:48:23</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBill.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBackBillList.html">
-      <publishTime>03/31/2021 15:36:03</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html">
-      <publishTime>07/16/2021 17:40:57</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Xs_SeOrderPickUp_New.html">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_Fast.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBackBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html">
-      <publishTime>07/20/2021 17:07:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBillList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html">
-      <publishTime>07/20/2021 14:58:15</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/qrscan.js">
-      <publishTime>03/23/2021 14:14:38</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBill.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBackBillList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBillList.html">
-      <publishTime>04/16/2021 14:21:33</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html">
-      <publishTime>07/20/2021 17:07:50</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html">
-      <publishTime>03/29/2021 10:48:24</publishTime>
+      <publishTime>08/16/2021 17:24:30</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/05/2021 11:13:14</publishTime>
+      <publishTime>08/19/2021 08:46:24</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9c938fd..8ad5cb5 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,9 +105,13 @@
     <Content Include="views\grf\a.grf" />
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
+    <Content Include="views\PublicPage\Gy_MaterType.html" />
+    <Content Include="views\PublicPage\CheckItemInformation.html" />
+    <Content Include="views\PublicPage\Gy_Maintain.html" />
     <Content Include="views\ReportHtml.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -507,6 +511,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Unit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EmployeeList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckItem.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MouldType.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QCCheckClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EquipMent_Edit.html" />
@@ -596,6 +601,7 @@
     <Content Include="views\鐢熶骇宸ュ簭绠$悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_Add_ProductReportBillList.html" />
     <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList.html" />
+    <Content Include="views\鐢熶骇绠$悊\浜ч噺姹囨姤鍗昞Sc_ProductReportBillList_Web.html" />
     <Content Include="views\鐢熶骇绠$悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
     <Content Include="views\鐢熶骇绠$悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js
index 75767e7..ec9209f 100644
--- a/WebTM/layuiadmin/PubCustom.js
+++ b/WebTM/layuiadmin/PubCustom.js
@@ -96,11 +96,13 @@
 //    var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
 //    var linterid = params[params[1]];//婧愬崟id
 //    var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+//    var HBillNo = params[params[3]];//鍗曟嵁鍙�
 //}
 //鍥哄畾鍙傛暟锛�
 //    var OperationType = params[params[0]];//鎿嶄綔绫诲瀷1.鏃犳簮鍗曟柊澧�2.鏈夋簮鍗曟柊澧�3.缂栬緫4.娴忚5.鍙樻洿
 //    var linterid = params[params[1]];//婧愬崟id
 //    var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+//    var HBillNo = params[params[3]];//鍗曟嵁鍙�
 
 /**
  *淇layui妗嗘灦鏃堕棿鎺т欢鏃犳晥闂锛屽姞杞芥椂闂存帶鍒跺墠鍏堣皟鐢ㄦ鏂规硶锛堝鏋滄椂闂存帶浠舵病闂灏变笉鐢ㄨ皟鐢ㄦ鏂规硶锛�
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index b71b61c..f2d0f60 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,6 +5,7 @@
     //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/layuiadmin/layui/css/ReportPlatform.css b/WebTM/layuiadmin/layui/css/ReportPlatform.css
index e439a44..3bfb0bf 100644
--- a/WebTM/layuiadmin/layui/css/ReportPlatform.css
+++ b/WebTM/layuiadmin/layui/css/ReportPlatform.css
@@ -142,7 +142,7 @@
 .imgtitle {
     text-align: center;
     display: block;
-    font-size: 30px;
+    font-size: 20px;
 }
 
 .layui-icon {
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
index 440043a..29e768b 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Sc_ICMOBillListView.html"
@@ -48,7 +48,7 @@
                 //var sMainStr = JSON.stringify(table.cache['ck-table']);
                 var checkStatus = table.checkStatus('ck-table')
                  , data = checkStatus.data;
-                parent.GetICMOBillValue(data);
+                parent.GetICMOBillValue(data[0].hmainid);
                 var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 75272cf..da8a597 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -554,7 +554,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
                    
                 },
@@ -594,7 +594,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -634,7 +634,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -674,7 +674,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
@@ -710,7 +710,7 @@
                 shift: 2,
                 area: ['100%', '100%'],
                 maxmin: true,
-                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?hID=&Type=2',
+                content: '鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
                 end: function () {
 
                 },
diff --git a/WebTM/views/PublicPage/CheckItemInformation.html b/WebTM/views/PublicPage/CheckItemInformation.html
new file mode 100644
index 0000000..29dc889
--- /dev/null
+++ b/WebTM/views/PublicPage/CheckItemInformation.html
@@ -0,0 +1,254 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妫�楠岄」鐩垪琛ㄨ祫鏂�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/treeTable.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046  sessionStorage["OrganizationID"] 
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //鍒楄〃
+
+            tree.render({
+                elem: '#treeCheckItem',
+                data: getData(sWhere),
+                showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+                id: 'demoId',
+                isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+                showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+                onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+                click: function (obj) {
+                    //鐐瑰嚮楂樺厜
+                    if (obj.data.id !== treeCkData.id) {
+                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = obj.data;
+                        TagId = obj.data.id;
+                        TagParentId = obj.data.ParentID;
+                    }
+                    else {
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = { id: 0 };
+                        TagId = "";
+                        TagParentId = "";
+                    }
+
+
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_MaintenanceMode/CheckItemCX',
+                        type: "GET",
+                        data: { "HInterID": obj.data.id },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                option.data = data1.data;
+                                table.render(option);
+                                layer.close(index);
+                            } else {
+                                layer.close(index);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(index);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '妫�楠岄」鐩唬鐮�' }
+                    , { field: 'HName', title: '妫�楠岄」鐩�' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/CheckItemList',
+                type: "GET",
+                data: { "sWhere": SeachFilter(sWhere1) },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(index);
+                    } else {
+                        layer.close(index);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+               
+                $.ajax({
+                    url: GetWEBURL() + '/PublicPageMethod/CheckItemList',
+                    type: "GET",
+                    data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_MaintenanceMode/CheckItemLoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            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>
+</html>
diff --git a/WebTM/views/PublicPage/DeptInformation.html b/WebTM/views/PublicPage/DeptInformation.html
index 9b49b3b..2e5a706 100644
--- a/WebTM/views/PublicPage/DeptInformation.html
+++ b/WebTM/views/PublicPage/DeptInformation.html
@@ -87,7 +87,7 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷100046  sessionStorage["OrganizationID"] 
             var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
 
             tree.render({
diff --git a/WebTM/views/PublicPage/Gy_Maintain.html b/WebTM/views/PublicPage/Gy_Maintain.html
new file mode 100644
index 0000000..5118664
--- /dev/null
+++ b/WebTM/views/PublicPage/Gy_Maintain.html
@@ -0,0 +1,254 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>閫夋嫨淇濆吇椤圭洰璧勬枡</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/treeTable.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                            <div id="treeMaintain" lay-filter="treeMaintain" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1  ";  //鍒楄〃
+
+            tree.render({
+                elem: '#treeMaintain',
+                data: getData(sWhere),
+                showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+                id: 'demoId',
+                isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+                showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+                onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+                click: function (obj) {
+                    //鐐瑰嚮楂樺厜
+                    if (obj.data.id !== treeCkData.id) {
+                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = obj.data;
+                        TagId = obj.data.id;
+                        TagParentId = obj.data.ParentID;
+                    }
+                    else {
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = { id: 0 };
+                        TagId = "";
+                        TagParentId = "";
+                    }
+
+
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_MaintenanceMode/MaintainCX',
+                        type: "GET",
+                        data: { "HInterID": obj.data.id },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                option.data = data1.data;
+                                table.render(option);
+                                layer.close(index);
+                            } else {
+                                layer.close(index);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(index);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '淇濆吇椤圭洰浠g爜' }
+                    , { field: 'HName', title: '淇濆吇椤圭洰' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/MaintainList',
+                type: "GET",
+                data: { "sWhere": SeachFilter(sWhere1) },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(index);
+                    } else {
+                        layer.close(index);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+               
+                $.ajax({
+                    url: GetWEBURL() + '/PublicPageMethod/MaintainList',
+                    type: "GET",
+                    data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_MaintenanceMode/MaintainLoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            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>
+</html>
diff --git a/WebTM/views/PublicPage/Gy_MaterType.html b/WebTM/views/PublicPage/Gy_MaterType.html
new file mode 100644
index 0000000..71f01da
--- /dev/null
+++ b/WebTM/views/PublicPage/Gy_MaterType.html
@@ -0,0 +1,254 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鐗╂枡绫诲埆鍒楄〃璧勬枡</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
+    <script src="../../layuiadmin/layui/layui.js"></script>
+    <script src="../../layuiadmin/treeTable.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/layui/lay/modules/util.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                            <div id="treeMaterType" lay-filter="treeMaterType" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+
+        layui.config({
+            base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046  sessionStorage["OrganizationID"] 
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 ";  //鍒楄〃
+
+            tree.render({
+                elem: '#treeMaterType',
+                data: getData(sWhere),
+                showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+                id: 'demoId',
+                isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+                showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+                onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+                click: function (obj) {
+                    //鐐瑰嚮楂樺厜
+                    if (obj.data.id !== treeCkData.id) {
+                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = obj.data;
+                        TagId = obj.data.id;
+                        TagParentId = obj.data.ParentID;
+                    }
+                    else {
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = { id: 0 };
+                        TagId = "";
+                        TagParentId = "";
+                    }
+
+
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_MaintenanceMode/MaterTypeCX',
+                        type: "GET",
+                        data: { "HInterID": obj.data.id },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                option.data = data1.data;
+                                table.render(option);
+                                layer.close(index);
+                            } else {
+                                layer.close(index);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(index);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+
+            var option = {
+                elem: '#mainTable'
+                //, toolbar: '#toolbarDemo'
+                , height: 'full-120'
+                , page: true
+                , cellMinWidth: 90
+                , cols: [[
+                    { type: 'radio', fixed: 'left' }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                    , { field: 'HNumber', title: '绫诲瀷浠g爜' }
+                    , { field: 'HName', title: '绫诲瀷' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/MaterTypeList',
+                type: "GET",
+                data: { "sWhere": SeachFilter(sWhere1) },
+                success: function (data1) {
+                    if (data1.count == 1) {
+                        option.data = data1.data;
+                        table.render(option);
+                        layer.close(index);
+                    } else {
+                        layer.close(index);
+                        layer.alert(data1.code + data1.Message, { icon: 5 });
+                    }
+                }, error: function () {
+                    layer.close(index);
+                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                }
+            });
+
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+               
+                $.ajax({
+                    url: GetWEBURL() + '/PublicPageMethod/MaterTypeList',
+                    type: "GET",
+                    data: { "sWhere": SeachFilter(sWhere1) },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_MaintenanceMode/MaterTypeLoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            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>
+</html>
diff --git a/WebTM/views/PublicPage/UnitInformation.html b/WebTM/views/PublicPage/UnitInformation.html
index 204f90c..b5e21aa 100644
--- a/WebTM/views/PublicPage/UnitInformation.html
+++ b/WebTM/views/PublicPage/UnitInformation.html
@@ -87,8 +87,8 @@
                 , laydate = layui.laydate
                 , util = layui.util
                 , tree = layui.tree
-            var sWhere = " where HStopFlag=0 and HEndFlag<>'1' and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鏍戝瀷
-            var sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " ";  //鍒楄〃
+            var sWhere = " where HStopFlag=0 and HEndFlag<>'1'  "; //鏍戝瀷
+            var sWhere1 = " where HStopFlag=0 and HEndFlag=1  ";  //鍒楄〃
 
             tree.render({
                 elem: '#treeUnit',
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index afdf42c..5d472fb 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -241,6 +241,7 @@
         {
             var HNumber = $("#HNumber").val();
             var HName = $("#HName").val();
+            sWhere1 = " where 1=1 ";
             if (HNumber) {
                 sWhere1 += " and HNumber like '%" + HNumber + "%'";
             }
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index 357b5d1..d516872 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -99,12 +99,12 @@
                                                     <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
                                                 </a>
                                             </li>
-                                            <li class="layui-col-xs3">
+                                            <!--<li class="layui-col-xs3">
                                                 <a lay-href="set/user/info.html">
                                                     <i class="layui-icon layui-icon-set"></i>
                                                     <cite>鎴戠殑璧勬枡</cite>
                                                 </a>
-                                            </li>
+                                            </li>-->
                                         </ul>
                                     </div>
                                     <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
@@ -194,12 +194,12 @@
                                                     <cite>濮斿宸ュ簭鍙戝嚭鍗�</cite>
                                                 </a>
                                             </li>
-                                            <li class="layui-col-xs3">
+                                            <!--<li class="layui-col-xs3">
                                                 <a lay-href="set/user/info.html">
                                                     <i class="layui-icon layui-icon-set"></i>
                                                     <cite>鎴戠殑璧勬枡</cite>
                                                 </a>
-                                            </li>
+                                            </li>-->
                                         </ul>
                                     </div>
                                     <div class="layui-carousel-ind"><ul><li class="layui-this"></li><li class=""></li></ul></div><button class="layui-icon layui-carousel-arrow" lay-type="sub">顦�</button><button class="layui-icon layui-carousel-arrow" lay-type="add">顦�</button>
@@ -272,27 +272,31 @@
                             <div carousel-item="">
                                 <ul class="layui-row layui-col-space10 layui-this">
                                     <li class="layui-col-xs6">
-                                        <a lay-href="app/content/comment.html" class="layadmin-backlog-body">
+                                        <a href="javascript:void(0);">
+                                            <!--<a lay-href="app/content/comment.html" class="layadmin-backlog-body">-->
                                             <h3>寰呭璇勮</h3>
-                                            <p><cite>66</cite></p>
+                                            <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
-                                        <a lay-href="app/forum/list.html" class="layadmin-backlog-body">
+                                        <a href="javascript:void(0);">
+                                            <!--<a lay-href="app/forum/list.html" class="layadmin-backlog-body">-->
                                             <h3>寰呭甯栧瓙</h3>
-                                            <p><cite>12</cite></p>
+                                            <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
-                                        <a lay-href="template/goodslist.html" class="layadmin-backlog-body">
+                                        <a href="javascript:void(0);">
+                                            <!--<a lay-href="template/goodslist.html" class="layadmin-backlog-body">-->
                                             <h3>寰呭鍟嗗搧</h3>
-                                            <p><cite>99</cite></p>
+                                            <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                     <li class="layui-col-xs6">
-                                        <a href="javascript:;" onclick="layer.tips('涓嶈烦杞�', this, {tips: 3});" class="layadmin-backlog-body">
+                                        <a href="javascript:void(0);">
+                                            <!--<a href="javascript:;" onclick="layer.tips('涓嶈烦杞�', this, {tips: 3});" class="layadmin-backlog-body">-->
                                             <h3>寰呭彂璐�</h3>
-                                            <p><cite>20</cite></p>
+                                            <p><cite>0</cite></p>
                                         </a>
                                     </li>
                                 </ul>
@@ -300,7 +304,7 @@
                                     <li class="layui-col-xs6">
                                         <a href="javascript:;" class="layadmin-backlog-body">
                                             <h3>寰呭鍙嬫儏閾炬帴</h3>
-                                            <p><cite style="color: #FF5722;">5</cite></p>
+                                            <p><cite style="color: #FF5722;">0</cite></p>
                                         </a>
                                     </li>
                                 </ul>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 4837c18..0b2b885 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -50,8 +50,9 @@
                 </ul>
                 <ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
 
-                    <li class="layui-nav-item" lay-unselect>
-                        <a lay-href="app/message/index.html" layadmin-event="message" lay-text="娑堟伅涓績">
+                    <li class="layui-nav-item" lay-unselect >
+                        <a href="javascript:void(0);">
+                        <!--<a lay-href="app/message/index.html" layadmin-event="message" lay-text="娑堟伅涓績">-->
                             <i class="layui-icon layui-icon-notice"></i>
 
                             <!--濡傛灉鏈夋柊娑堟伅锛屽垯鏄剧ず灏忓渾鐐�-->
@@ -302,7 +303,7 @@
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">鐢熶骇姹囨姤鍗�</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">鐢熶骇姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="">浜ч噺姹囨姤鍗昻ull</a></dd>
-                                        <dd><a lay-href="">浜ч噺姹囨姤鍗曠淮鎶ull</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/浜ч噺姹囨姤鍗�/Sc_ProductReportBillList_Web.html">浜ч噺姹囨姤鍗曠淮鎶�</a></dd>
                                         <dd><a lay-href="">璐ㄩ噺姹囨姤鍗昻ull</a></dd>
                                         <dd><a lay-href="">璐ㄩ噺姹囨姤鍗曠淮鎶ull</a></dd>
                                     </dl>
@@ -310,12 +311,11 @@
                                 <dd>
                                     <a>寮�缁撶彮绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList">寮�鐝崟</a></dd>
-
+                                        <dd><a lay-href="">寮�鐝崟null</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇寮�宸ュ崟/Sc_MESBeginWorkBillList.html">寮�鐝崟缁存姢</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鍋滃伐鎸傝捣鍗�/Sc_Add_MESStopWorkBillList.html">鍋滃伐鎸傝捣鍗�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鍋滃伐鎸傝捣鍗�/Sc_MESStopUpWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html">缁撶彮鍗�</a></dd>
+                                        <dd><a lay-href="">鍋滃伐鎸傝捣鍗昻ull</a></dd>
+                                        <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇鍋滃伐鍗�/Sc_MESStopWorkBillList.html">鍋滃伐鎸傝捣鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="">缁撶彮鍗昻ull</a></dd>
                                         <dd><a lay-href="鐢熶骇绠$悊/鐢熶骇瀹屽伐鍗�/Sc_MESEndWorkBillList.html">缁撶彮鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
@@ -454,7 +454,7 @@
                                 <dd>
                                     <a>鍩虹寤烘ā</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="">妯℃不鍏峰垎绫诲垪琛╪</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">妯℃不鍏峰垎绫诲垪琛�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">妯℃不鍏锋。妗�</a></dd>
                                         <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">妯℃不鍏锋。妗堢淮鎶�</a></dd>
                                     </dl>
@@ -488,14 +488,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
@@ -535,14 +535,14 @@
                                 <dd>
                                     <a>鏃ュ父绠$悊</a>
                                     <dl class="layui-nav-child">
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗�</a></dd>
-                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillList.html">淇濆吇璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html">淇濆吇璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillList.html">淇濆吇璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipMaintainBillEdit.html">淇濆吇璁板綍鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillList.html">鐐规璁″垝鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html">鐐规璁″垝鍗曠淮鎶�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillList.html">鐐规璁板綍鍗�</a></dd>
+                                        <dd><a lay-href="璁惧绠$悊/Sb_EquipDotCheckBillEdit.html">鐐规璁板綍鍗曠淮鎶�</a></dd>
                                     </dl>
                                 </dd>
                                 <dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
index 30cd780..f074b98 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_CheckItem.html"
@@ -158,7 +158,7 @@
                 data.field.HItemID = hID == "" ? 0 : hID;
 
                 data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-                data.field.HLevel = HType == "" ? 1 : HType;
+                //data.field.HLevel = HType == "" ? 1 : HType;
 
                 var oMain = JSON.stringify(data.field)
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
new file mode 100644
index 0000000..f99e4f5
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
@@ -0,0 +1,255 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫妯℃不鍏峰垎绫�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+    </style>
+</head>
+<body>
+
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
+                                                    <input id="HItemID" name="HItemID" type="hidden" />
+                                                    <input id="HParentID" name="HParentID" type="hidden" />
+                                                    <input id="HLevel" name="HLevel" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍔╄鐮�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        function getUrlVars() {
+            var vars = [], hash;
+            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+            for (var i = 0; i < hashes.length; i++) {
+                hash = hashes[i].split('=');
+                vars.push(hash[0]);
+                vars[hash[0]] = hash[1];
+            }
+            return vars;
+        }
+
+
+
+        var params = getUrlVars();
+        var hID = params[params[0]];//缂栬緫鏌ョ湅
+        var HType = params[params[1]];    //鍗曟嵁鐘舵�併�佸眰绾�
+        var TagParentId = params[params[2]];  //鐖剁骇ID
+
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index' //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , laydate = layui.laydate
+                , element = layui.element;
+            //#endregion
+            //甯歌鐢ㄦ硶
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+
+            //#region 宸ュ叿鎸夐挳
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                //sessionStorage["SourceFlag"] = false;
+                parent.location.href = "../../../views/index.html"
+                //window.close();//鍏抽棴褰撳墠椤�
+            })
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var ModRightNameAdd = 'Gy_MouldType_Edit';
+                var user = sessionStorage["HUserName"];
+                var arr = new Array();
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+                data.field.HItemID = hID == "" ? 0 : hID;
+
+                data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
+                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();
+
+                var oMain = JSON.stringify(data.field)
+
+                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
+
+                if (HType == "Modify") {
+
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_ModelType/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+                else {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_ModelType/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "oMain": oMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
+
+            //#endregion
+
+
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
+            }
+
+            if (HType == "Modify") {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_ModelType/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": hID
+                    },
+                    success: function (d) {
+                   
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HHelpCode").val(d.data[0].HHelpCode);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HLevel").val(d.data[0].HLevel);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
index df96f47..1636dba 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_QCCheckClass.html"
@@ -93,8 +93,9 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-//鑾峰彇鍙傛暟
+        //鑾峰彇鍙傛暟
         function getUrlVars() {
             var vars = [], hash;
             var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -105,8 +106,6 @@
             }
             return vars;
         }
-
-
 
         var params = getUrlVars();
         var hID = params[params[0]];//缂栬緫鏌ョ湅
@@ -221,6 +220,7 @@
                         });
                 }
             });
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
@@ -304,6 +304,11 @@
                     }
                 });
             });
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
+            })
         });
     </script>
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 0f2d2df..9c5eca3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -49,13 +49,13 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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-form"></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="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <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-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
new file mode 100644
index 0000000..958c121
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -0,0 +1,453 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯℃不鍏峰垎绫诲垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
+    <script src="../../../layuiadmin/treeTable.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <style media="screen">
+        .custom-tree-item-clicked {
+            color: #FC9003
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div style="padding: 10px;">
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                </div>
+
+                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
+                                    <div class="layui-row" style="padding:10px 0">
+                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                            <div id="treeCheckItem" lay-filter="treeCheckItem" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs9 layui-inline">
+                                            <div class="layui-row">
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">浠g爜</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-inline">
+                                                    <label class="layui-form-label">鍚嶇О</label>
+                                                    <div class="layui-input-block">
+                                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                                    </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>
+                                            </div>
+                                            <div>
+                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        var treeCkData = { id: 0 };
+        var TagId = "";
+        var TagParentId = "";
+        var Level = "1";
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+                , util = layui.util
+                , tree = layui.tree
+            //鏌ヨ鏉′欢
+            var sWhere = "";
+            var option = [];
+            let that = this;
+            //#endregion
+
+            
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栧姞杞芥爲鍨�
+            tree.render({
+                elem: '#treeCheckItem',
+                data: getData(sWhere),
+                showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
+                id: 'demoId',
+                isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+                showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+                onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
+                click: function (obj) {
+                    //鐐瑰嚮楂樺厜
+                    if (obj.data.id !== treeCkData.id) {
+                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = obj.data;
+                        TagId = obj.data.id;
+                        TagParentId = obj.data.ParentID;
+                        Level = obj.data.HLevel + 1;
+                    }
+                    else {
+                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                        treeCkData = { id: 0 };
+                        TagId = "";
+                        TagParentId = "";
+                        Level = "1";
+                    }
+
+                    $.ajax({
+                        url: GetWEBURL() + '/Gy_ModelType/cx',
+                        type: "GET",
+                        data: { "HInterID": obj.data.id },
+                        success: function (data1) {
+                            if (data1.count == 1) {
+                                option.data = data1.data;
+                                table.render(option);
+                                layer.close(index);
+                            } else {
+                                layer.close(index);
+                                layer.alert(data1.code + data1.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(index);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+            });
+
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
+
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //#region鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: '500'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'radio', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'HParentID', title: 'HParentID', sort: true, hide: true }
+                        , { field: 'HNumber', title: '浠g爜', width: 200 }
+                        , { field: 'HName', title: '鍚嶇О', width: 200 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 200 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 200 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 200 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 200 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 200 }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_ModelType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+           //#endregion
+
+
+            //#region 宸ュ叿鏍忎簨浠�
+            //鏂板
+            form.on('submit(btnAdd)', function (obj) {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妫�楠岄」鐩�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level+''],
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
+            })
+
+            //鍒犻櫎
+            form.on('submit(btndelete)', function (obj) {
+                var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
+                if (TagId != "") {
+                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                        , yes: function (index, layero) {
+
+                            $.ajax({
+                                url: GetWEBURL() + '/Gy_ModelType/Delete_Json',
+                                type: "GET",
+                                //async: true,
+                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                                success: function (result) {
+                                    if (result.count == 1) {
+                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                            // 寰楀埌frame绱㈠紩
+                                            var index = layer.getFrameIndex(window.name);
+                                            //鍏抽棴褰撳墠frame
+                                            layer.close(index);
+                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                            window.location.reload();
+                                            //閲嶈浇tree
+                                            tree.reload('treeDepartment', {});
+                                        });
+
+                                    } else {
+                                        layer.alert(result.code + result.Message, { icon: 5 });
+                                    }
+                                }
+                            })
+                        }
+                    });
+                }
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    var layEvent = checkStatus.event;
+                    if (checkStatus.data.length === 1) {
+                        layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                            btn: ['纭畾', '鍙栨秷'] //鎸夐挳
+                            , yes: function (index, layero) {
+
+                                $.ajax({
+                                    url: GetWEBURL() + '/Gy_ModelType/Delete_Json',
+                                    type: "GET",
+                                    //async: true,
+                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                                    success: function (result) {
+                                        if (result.count == 1) {
+                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                                // 寰楀埌frame绱㈠紩
+                                                var index = layer.getFrameIndex(window.name);
+                                                //鍏抽棴褰撳墠frame
+                                                layer.close(index);
+                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                                window.location.reload();
+                                                //閲嶈浇tree
+                                                tree.reload('treeDepartment', {});
+                                            });
+
+                                        } else {
+                                            layer.alert(result.code + result.Message, { icon: 5 });
+                                        }
+                                    }
+                                })
+                            }
+                        });
+                    }
+                    else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                    }
+                }
+            });
+
+            //淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                if (TagId != "") {
+                    layer.open({
+                        type: 2
+                        , area: ['80%', '80%']
+                        , title: '缂栬緫妯℃不鍏峰垎绫�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    if (checkStatus.data.length === 1) {
+                        var hID = data[0].HItemID;
+                        TagParentId = data[0].HParentID;
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['80%', '80%']
+                            , title: '缂栬緫妯℃不鍏峰垎绫�'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+
+                    } else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                    }
+                }
+            });
+            
+            //鏌ヨ鎸夐挳
+            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() + '/Gy_ModelType/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+            //#endregion
+
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //    , trigger: 'click'
+            //    , format:'yyyy-MM-dd HH:mm'
+            //});
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+        //鏌ヨ鏍戠姸鏁版嵁
+        function getData(sWhere) {
+            var treeData;
+
+            $.ajax({
+                url: GetWEBURL() + '/Gy_ModelType/LoadTree',
+                type: "GET",
+                data: { "sWhere": sWhere },
+                async: false,
+                success: function (result) {
+                    var data = result.data;
+                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                    treeData = LoadTree(data);
+
+                }
+            });
+            return treeData;
+        }
+        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        function LoadTree(data) {
+            let map = {};
+            let treeData = [];
+            data.forEach(it => {
+                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+            })
+            //鐢熸垚缁撴灉闆�
+            data.forEach(it => {
+                const parent = map[it.HParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                if (parent) {
+                    if (!Array.isArray(parent.children)) parent.children = [];
+                    parent.children.push(it);
+                } else {
+                    treeData.push(it)
+                }
+            })
+            return treeData;
+        }
+
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
index bbc3846..fd35b34 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_QCCheckClass.html"
@@ -126,6 +126,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            // #region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -137,7 +138,12 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            var option = [];
+            //#endregion 
 
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栧姞杞芥爲鍨�
             tree.render({
                 elem: '#treeCheckItem',
                 data: getData(sWhere),
@@ -147,135 +153,191 @@
                 showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
                 onlyIconControl: true,   //鐐瑰嚮鍚庝笉鏀剁缉
                 click: function (obj) {
-                    //鐐瑰嚮楂樺厜
-                    if (obj.data.id !== treeCkData.id) {
-                        $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
-                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-                        treeCkData = obj.data;
-                        TagId = obj.data.id;
-                        TagParentId = obj.data.ParentID;
-                    }
-                    else {
-                        $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
-                        treeCkData = { id: 0 };
-                        TagId = "";
-                        TagParentId = "";
-                    }
-                    //鑾峰彇鎵�鏈夐�変腑鑺傜偣id鏁扮粍
-                    //var oCks = tree.getChecked('demoId'); //鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
-                    //for (var i = 0; i < oCks.length; i++) {
-                    //    //console.log(oCks[0].id, obj.data.id);
-                    //    if (oCks[i].id != obj.data.id) {
-                    //        console.log(oCks[i]);
-                    //        //鎵ц鑺傜偣鍕鹃��
-
-                    //        $(oCks[i]).prop("checked", false);
-                    //        $(this).prop("checked", false);
-                    //    }
-                    //}
-                    //form.render('checkbox');
-
-
-                    $.ajax({
-                        url: GetWEBURL() + '/Gy_QCCheckClass/cx',
-                        type: "GET",
-                        data: { "HInterID": obj.data.id },
-                        success: function (data1) {
-                            if (data1.count == 1) {
-                                option.data = data1.data;
-                                table.render(option);
-                                layer.close(index);
-                            } else {
-                                layer.close(index);
-                                layer.alert(data1.code + data1.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.close(index);
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        }
-                    });
+                    TreeClick(obj);
                 }
             });
 
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
 
-            //$.ajax({
-            //    type: "get",
-            //    url: GetWEBURL() + '/Gy_Department/LoadTree',
-            //    async: true,
-            //    success: function (result) {
-            //        //  console.log(result.data);
-            //        var tree = Customerdatatree('treeDepartment', result.data, true);
-            //        tree.onspread = function () {
-            //            var obj = this;
-            //            //妯℃嫙post鍚庡彴鏁版嵁锛屽欢杩�2绉�
-            //            setTimeout(() => {
-            //                var data = getTreeJson(obj.data.HParentID); //寮傛鑾峰彇鏁版嵁
-            //                obj.lazytree(data);
-            //            }, 2000);
-            //        }
-            //        tree.onclick = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.state); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //            console.log(obj.data.children); //褰撳墠鑺傜偣涓嬫槸鍚︽湁瀛愯妭鐐�
-            //        }
-            //        tree.oncheck = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.checked); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //        }
-            //    }
-            //});
+            //#endregion
 
-
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'radio', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
-                    , { field: '浠g爜', title: '浠g爜' }
-                    , { field: '鍚嶇О', title: '鍚嶇О' }
-                    , { field: '绛夌骇', title: '绛夌骇' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Gy_QCCheckClass/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
-
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //鏂板
             form.on('submit(btnAdd)', function (obj) {
+                set_AddNew(obj);
+            })
+
+            //淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                set_ShowBill(data);
+            });
+
+            //鍒犻櫎
+            form.on('submit(btndelete)', function (obj) {
+                set_DeleteBill(obj);
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 妫�楠岄」鐩被鍒唬鐮� like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 妫�楠岄」鐩被鍒悕绉� like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            });
+
+
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //鏌ヨ鏍戠姸鏁版嵁
+            function getData(sWhere) {
+                var treeData;
+
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_QCCheckClass/LoadTree',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    async: false,
+                    success: function (result) {
+                        console.log(result);
+                        var data = result.data;
+                        //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+                        treeData = LoadTree(data);
+
+                    }
+                });
+                return treeData;
+            }
+
+            ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+            function LoadTree(data) {
+                let map = {};
+                let treeData = [];
+                data.forEach(it => {
+                    map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+                })
+                //鐢熸垚缁撴灉闆�
+                data.forEach(it => {
+                    const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+                    if (parent) {
+                        if (!Array.isArray(parent.children)) parent.children = [];
+                        parent.children.push(it);
+                    } else {
+                        treeData.push(it)
+                    }
+                })
+                return treeData;
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill()
+            {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            
+            //鏍戝瀷鐐瑰嚮鏌ヨ
+            function TreeClick(obj) {
+                //鐐瑰嚮楂樺厜
+                if (obj.data.id !== treeCkData.id) {
+                    $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+                    $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                    treeCkData = obj.data;
+                    TagId = obj.data.id;
+                    TagParentId = obj.data.ParentID;
+                }
+                else {
+                    $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+                    treeCkData = { id: 0 };
+                    TagId = "";
+                    TagParentId = "";
+                }
+
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_QCCheckClass/cx',
+                    type: "GET",
+                    data: { "HInterID": obj.data.id },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'radio', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                        , { field: '浠g爜', title: '浠g爜' }
+                        , { field: '鍚嶇О', title: '鍚嶇О' }
+                        , { field: '绛夌骇', title: '绛夌骇' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere)
+            {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_QCCheckClass/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew(obj)
+            {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -295,10 +357,65 @@
                     }
                 });
                 return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
+            }
+
+            //淇敼
+            function set_ShowBill(data) {
+                if (TagId != "") {
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '缂栬緫妫�楠岄」鐩被鍒�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                }
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    if (checkStatus.data.length === 1) {
+                        var hID = data[0].HItemID.toString();
+                        TagParentId = data[0].ParentID.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['55%', '55%']
+                            , title: '缂栬緫妫�楠岄」鐩被鍒�'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
+
+                    } else {
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                    }
+                }
+            }
 
             //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
+            function set_DeleteBill(obj) {
                 var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
                 if (TagId != "") {
                     layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
@@ -372,149 +489,13 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
                 }
-            });
+            }
 
-
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 妫�楠岄」鐩被鍒唬鐮� like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 妫�楠岄」鐩被鍒悕绉� like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_QCCheckClass/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                if (TagId != "") {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '缂栬緫妫�楠岄」鐩被鍒�'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                }
-                else {
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    if (checkStatus.data.length === 1) {
-                        var hID = data[0].HItemID.toString();
-                        TagParentId = data[0].ParentID.toString();
-                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                        layer.open({
-                            type: 2
-                            , area: ['55%', '55%']
-                            , title: '缂栬緫妫�楠岄」鐩被鍒�'
-                            , closeBtn: 1
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-
-                            , resize: false,
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            }
-                            , cancel: function () {
-                                //$(".layui-btn").removeClass("layui-btn-disabled");
-                            }
-                        })
-
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#endregion
 
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_QCCheckClass/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    console.log(result);
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
-
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
-
-
     </script>
 
 </body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 04602c0..58eb2dd 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -281,6 +281,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -288,37 +289,40 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            });
-            laydate.render({
-                elem: '#HRepairBeginDate'
-            });
-            laydate.render({
-                elem: '#HRepairEndDate'
-            });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HRepairBeginDate'
+                });
+                laydate.render({
+                    elem: '#HRepairEndDate'
+                });
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
                     , { field: 'HRepairID', title: 'HRepairID', edit: 'text', hide: true }
                     , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠g爜', edit: 'text', event: "HRepairCode" }
-                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text'}
+                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text' }
                     , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
                     , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
@@ -326,10 +330,33 @@
                     , { field: 'HMoney', title: '缁翠慨璐圭敤', event: "", edit: 'text' }
                     , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
                     , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+            //#endregion
+
+
+            
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
+            
+            //#region 鍒ゆ柇鏄惁鏂板
             if (hID == null || hID == 0) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                 option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0,"HManagerCode":"", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " }];
@@ -358,8 +385,9 @@
                 });
 
             }
+            //#endregion
 
-
+             //#region 瑙﹀彂浜嬩欢锛�
             //澶村伐鍏锋爮浜嬩欢
             var rowid = 0;
             var rows = 0;
@@ -369,30 +397,11 @@
                 var AddRow = table.cache['mainTable'];
                 var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HManagerID": 0, "HManagerCode": "", "HManagerName": "  ", "HMoney": 0, "HRemark": "  " };
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //澧炲姞涓�琛�
+                    case 'btn-AddLine': set_AddLine(NewRow, rows);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': set_CopyLine(data);
                         break;
                 }
             });
@@ -507,10 +516,68 @@
                 })
             });
 
+            //澧炲姞涓�琛�
+            function set_AddLine(NewRow, rows) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+                rows++;
+                layer.msg('澧炲姞涓�琛屾寜閽紒')
+            }
+
+            //澶嶅埗涓�琛�
+            function set_CopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    //layer.alert(copyrow);
+                }
+            }
+            //#endregion
 
 
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (hID == null || hID == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3807' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HRepairBeginDate").val(shijian);
+                        $("#HRepairEndDate").val(shijian);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            //濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else {
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+            //淇敼鈥斺�斿姞杞借〃澶�
+            function RoadBillMain(hID) {
                 //alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
@@ -565,36 +632,6 @@
                 });
             }
 
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3807' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HRepairBeginDate").val(shijian);
-                        $("#HRepairEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
 
             //鎴愬搧妯″叿寮圭獥
             form.on('submit(ProductModulList)', function () {
@@ -877,6 +914,44 @@
                 parent.location.href = "../../../views/index.html"
                 //window.close();//鍏抽棴褰撳墠椤�
             })
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
+                //debugger;
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                //瀵规暟鎹繘琛岄獙璇�
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Sb_MouldRepairWorkBill/SaveGetMouldRepairWorkBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
+                            }
+                        });
+                }
+            });
 
             function formatDate(date) {
                 var d = new Date(date),
@@ -890,41 +965,7 @@
                 return [year, month, day].join('-');
             }
 
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sb_MouldRepairWorkBill/SaveGetMouldRepairWorkBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                            }
-                            layer.closeAll("loading");
-                        },
-                        error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
-                        }
-                    });
-            });
+           
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
@@ -941,8 +982,9 @@
                 }
             });
 
-
         });
+
+        //#region 杩斿洖鍊�
         //瀹氫箟鍏ㄥ眬鍙橀噺
         var HReasonName, ReasonID, EmpName, SQProcName,
             ProcID, ZRProcName, QRName
@@ -1054,6 +1096,96 @@
             else {
                 return true;
             }
-        }</script>
+        }
+        //#endregion
+
+        //#region 鏁版嵁楠岃瘉
+        function AllowLoadData(sSubStr) {
+
+            if ($("#HMouldCode").val() == '') {
+                layer.msg("鎴愬搧妯″叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HRepairName").val() == '') {
+                layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HDeptName").val() == '') {
+                layer.msg("缁翠慨閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HManagerName").val() == '') {
+                layer.msg("涓荤娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HEmpName").val() == '') {
+                layer.msg("缁翠慨浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HName").val() == '') {
+                layer.msg("璇峰~鍐欐ā鍏峰悕绉�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HModel").val() == '') {
+                layer.msg("璇峰~鍐欐ā鍏疯鏍�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HSupName").val() == '') {
+                layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HEquipName").val() == '') {
+                layer.msg("璁惧娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鏁板瓧姝e垯(鍖呭惈灏忔暟)
+            var reg = /^\d+(\.\d+)?$/;
+            if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
+                layer.msg("璁″垝缁翠慨宸ユ椂璇峰~鍐欐暟瀛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (reg.test($("#HTimes").val()) == false || $("#HTimes").val() == '') {
+                layer.msg("瀹為檯缁翠慨宸ユ椂璇峰~鍐欐暟瀛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (reg.test($("#HNewDesignLife").val()) == false || $("#HTimes").val() == '') {
+                layer.msg("鏂拌璁″鍛借濉啓鏁板瓧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HBillNo").val() == '') {
+                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HInterID").val() == '') {
+                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鍒ゆ柇鐗╂枡鏄庣粏椤�
+            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HManagerCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if (sSubStr[i].HRepairCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    else {
+                        return true;
+                    }
+                }
+            }
+            else {
+                return true;
+            }
+        }
+             //#endregion
+    </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
index 6d18e3f..16a9e3a 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_MouldRepairWorkBillList.html"
@@ -121,6 +121,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+             // #region 鍏ㄥ眬鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -132,278 +133,323 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { 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: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
-                    , { field: 'HEquipID', title: 'HEquipID', width: 200, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
-                    , { field: '璁惧', title: '璁惧', width: 200 }
-                    , { field: '缁翠慨椤圭洰浠g爜', title: '缁翠慨椤圭洰浠g爜', width: 200 }
-                    , { field: '缁翠慨椤圭洰', title: '缁翠慨椤圭洰', width: 160 }
-                    , { field: '缁翠慨寮�濮嬫棩鏈�', title: '缁翠慨寮�濮嬫棩鏈�', width: 160, templet: "<div>{{d.缁翠慨寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.缁翠慨寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
-                    , { field: '缁翠慨缁撴潫鏃ユ湡', title: '缁翠慨缁撴潫鏃ユ湡', width: 160, 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: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                    , { field: '缁翠慨浜轰唬鐮�', title: '缁翠慨浜轰唬鐮�', width: 200 }
-                    , { field: '缁翠慨浜�', title: '缁翠慨浜�', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 115 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '缁翠慨閮ㄩ棬浠g爜', title: '缁翠慨閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '缁翠慨閮ㄩ棬', title: '缁翠慨閮ㄩ棬', width: 200 }
-                    , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
-                    , { field: '缁翠慨绫诲瀷', title: '缁翠慨绫诲瀷', width: 115 }
-                    , { field: '缁翠慨鍚庢柊瑙勬牸', title: '缁翠慨鍚庢柊瑙勬牸', width: 200 }
-                    , { field: '鏂拌璁″鍛�', title: '鏂拌璁″鍛�', width: 200 }
-                    , { field: '缁翠慨瑕佹眰', title: '缁翠慨瑕佹眰', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
-                    , { 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: 200 }
-                    , { field: 'HRepairID', title: 'HRepairID', width: 115, hide: true }
-                    , { field: '瀛愮淮淇」鐩唬鐮�', title: '瀛愮淮淇」鐩唬鐮�', width: 200 }
-                    , { field: '瀛愮淮淇」鐩�', title: '瀛愮淮淇」鐩�', width: 200 }
-                    , { field: '瀛愮淮淇姹�', title: '瀛愮淮淇姹�', width: 200 }
-                    , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
-                    , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
-                    , { field: '缁翠慨璐圭敤', title: '缁翠慨璐圭敤', width: 115 }
-                    , { 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, 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, 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, hide: true }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true}
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
-                ]]
-            };
+            //鍒濆鍖栭〉闈㈠姞杞�
+            set_ClearBill();
 
-            var index = layer.load(0);
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿缁翠慨鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'set_Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿缁翠慨鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
                         break;
-                    case 'btn-Audit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫瀹℃牳鏂规硶
-                            $.ajax({
-                                type: "GET",
-                                url: GetWEBURL() + "/Sb_MouldRepairWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                data: { "HInterID": InterID,"IsAudit":0, "CurUserName": sessionStorage["HUserName"] },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                }, error: function () {
-                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                }
-                            });
-
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
-                        }
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
                         break;
-                    case 'btn-DeAudit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫瀹℃牳鏂规硶
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_MouldRepairWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
-                        }
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
                         break;
+                    ////閫�鍑烘寜閽�
+                    //case 'get_Exit': Pub_Close(2);
+                    //    break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
             });
 
-            //閲嶇疆鎸夐挳
+            // 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $('#Status').find("option[value='-1']").attr("selected", true);
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");
-                $("#HMouldNumber").val("");
-                $("#HMouldName").val("");
-                $("#RepairItem").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
+           //#endregion
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { 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: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: 'HEquipID', title: 'HEquipID', width: 200, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
+                        , { field: '璁惧', title: '璁惧', width: 200 }
+                        , { field: '缁翠慨椤圭洰浠g爜', title: '缁翠慨椤圭洰浠g爜', width: 200 }
+                        , { field: '缁翠慨椤圭洰', title: '缁翠慨椤圭洰', width: 160 }
+                        , { field: '缁翠慨寮�濮嬫棩鏈�', title: '缁翠慨寮�濮嬫棩鏈�', width: 160, templet: "<div>{{d.缁翠慨寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.缁翠慨寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁翠慨缁撴潫鏃ユ湡', title: '缁翠慨缁撴潫鏃ユ湡', width: 160, 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: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: '缁翠慨浜轰唬鐮�', title: '缁翠慨浜轰唬鐮�', width: 200 }
+                        , { field: '缁翠慨浜�', title: '缁翠慨浜�', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 115 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '缁翠慨閮ㄩ棬浠g爜', title: '缁翠慨閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '缁翠慨閮ㄩ棬', title: '缁翠慨閮ㄩ棬', width: 200 }
+                        , { field: 'HSupID', title: 'HSupID', width: 200, hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 200 }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
+                        , { field: '缁翠慨绫诲瀷', title: '缁翠慨绫诲瀷', width: 115 }
+                        , { field: '缁翠慨鍚庢柊瑙勬牸', title: '缁翠慨鍚庢柊瑙勬牸', width: 200 }
+                        , { field: '鏂拌璁″鍛�', title: '鏂拌璁″鍛�', width: 200 }
+                        , { field: '缁翠慨瑕佹眰', title: '缁翠慨瑕佹眰', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+                        , { 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: 200 }
+                        , { field: 'HRepairID', title: 'HRepairID', width: 115, hide: true }
+                        , { field: '瀛愮淮淇」鐩唬鐮�', title: '瀛愮淮淇」鐩唬鐮�', width: 200 }
+                        , { field: '瀛愮淮淇」鐩�', title: '瀛愮淮淇」鐩�', width: 200 }
+                        , { field: '瀛愮淮淇姹�', title: '瀛愮淮淇姹�', width: 200 }
+                        , { field: '瀛愯礋璐d汉浠g爜', title: '瀛愯礋璐d汉浠g爜', width: 200 }
+                        , { field: '瀛愯礋璐d汉', title: '瀛愯礋璐d汉', width: 200 }
+                        , { field: '缁翠慨璐圭敤', title: '缁翠慨璐圭敤', width: 115 }
+                        , { 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, 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, 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, hide: true }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HBillType', title: 'HBillType', width: 200, hide: true }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0);
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿缁翠慨鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿缁翠慨鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_MouldRepairWorkBill/DeltetMouldRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_AuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_MouldRepairWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_DeAuditBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sb_MouldRepairWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    window.location.reload();
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
                 var Status = $("select[name='Status']").val();//鐘舵��
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
@@ -432,7 +478,7 @@
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
                 if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate1 + "'";
                 }
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
@@ -442,7 +488,7 @@
                 }
                 if (HMouldName) {
                     sWhere += " and 浜у搧妯″叿 like '%" + HMouldName + "%'";
-                } 
+                }
                 if (RepairItem) {
                     sWhere += " and 缁翠慨椤圭洰 like '%" + RepairItem + "%'";
                 }
@@ -451,7 +497,7 @@
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
@@ -475,13 +521,50 @@
                 //$("#HCreateBy").val("");//鍒跺崟浜�
                 //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
                 //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+            }
+
+            //閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $('#Status').find("option[value='-1']").attr("selected", true);
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");
+                $("#HMouldNumber").val("");
+                $("#HMouldName").val("");
+                $("#RepairItem").val("");
+                $("#btnSearch").click();
+            }
+            //#endregion
+
+            
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳
+                    case 'btn-Audit': set_AuditBill();
+                        break;
+                    //鍙嶅鏍�
+                    case 'btn-DeAudit': set_DeAuditBill();
+                        break;
+                };
             });
 
             //鐩戝惉琛屽弻鍑讳簨浠�
             table.on('rowDouble(mainTable)', function (obj) {
                 layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
             });
-
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
@@ -493,10 +576,6 @@
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-
-
-
     </script>
 
 </body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index 6740e28..f7f8dfe 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -55,7 +55,11 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">浜у搧妯″叿</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HMouldID" id="HMouldID" class="layui-input" value="0">
+                                                    <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
                                                 </div>
                                             </div>
                                         </div>
@@ -69,7 +73,11 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">淇濆吇璁″垝鍐呯爜</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="text" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="0">
+                                                    <input type="text" name="HPlanInterName" id="HPlanInterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HPlanInterID" id="HPlanInterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HPlanInterpList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
@@ -103,8 +111,20 @@
                                 </div>
                             </div>
                         </div>
-
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                        <div class="layui-tab layui-tab-card">
+                            <ul class="layui-tab-title">
+                                <li class="layui-this">淇濆吇椤逛俊鎭�</li>
+                                <li>閰嶄欢淇℃伅</li>
+                            </ul>
+                            <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                                <div class="layui-tab-item">
+                                    <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+                                </div>
+                            </div>
+                        </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
 
@@ -113,7 +133,18 @@
 
                             </div>
                         </script>
+                        <script type="text/html" id="toolbarDemo1">
+                            <div class="layui-btn-container">
+
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine1"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine1"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+                            </div>
+                        </script>
                         <script type="text/html" id="xuhao">
+                            {{d.LAY_TABLE_INDEX+1}}
+                        </script>
+                        <script type="text/html" id="xuhao1">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
                     </form>
@@ -125,34 +156,33 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
+    <script type="text/html" id="barDemo1">
+        <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del1">鍒犻櫎</a>
+    </script>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -160,2180 +190,147 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            var option;
+            var option2;
+            var option1;
+            var sBillType = "3807";
+            var TabRow = { "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": "0 ", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+            var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": "0", "HUnitNumber": "", "HUnitName": "", "HQty": "0", "HQtyMust": "0", "HManagerID": "0", "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            });
-            laydate.render({
-                elem: '#HBeginDate'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-            });
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: 'HMaterID', title: '閰嶄欢浠g爜', edit: 'text', event: "" }
-                    , { field: 'HUnitID', title: '鍗曚綅浠g爜', edit: 'text', event: "" }
-                    , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', edit: 'text' }
-                    , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', edit: 'text' }
-                    , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " }];
-                table.render(option);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+
+                set_EditFromGrid();
             }
             else {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
-                $.ajax({
-                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai',
-                    type: "GET",
-                    data: { "sqlWhere": "and HInterID=" + hID },
-                    success: function (result) {
-                        //console.log('gouba' + result);
-                        if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
-
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index0);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
+            //#endregion
 
-
-            //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            // 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
+                var rowid = 0;
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0   ", "HQtyMust": "0", "HManagerID": "0", "HRemark": "  " };
+                var NewRow = TabRow;
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
                         break;
                 }
             });
-            //琛屽唴浜嬩欢
+
+            // 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable1)', function (obj) {
+                var rowid = 0;
+                var checkStatus = table.checkStatus('mainTable1')
+                    , data = checkStatus.data;;
+                var AddRow = table.cache['mainTable1'];
+                var NewRow = TabRow1;
+                switch (obj.event) {
+                    //鏂板涓�琛�
+                    case 'btn-AddLine1': btnAddLine1(NewRow);
+                        break;
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine1': btnCopyLine1(data);
+                        break;
+                }
+            });
+
+            // 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event === 'del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex === '0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            var oldData = table.cache["mainTable"];
-                            oldData.splice(obj.tr.data('index'), 1);
-                            table.reload('mainTable', { data: oldData });
-                            layer.close(index);
-                        }
-                    });
-                }
-                if (obj.event === 'ReasonNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "1":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "2":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "3":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "4":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "5":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "6":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "7":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "8":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "9":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "10":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "11":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "12":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "13":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "14":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "15":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "16":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        , HBadReasonID: ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'EmpNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "1":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "2":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "3":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "4":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "5":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "6":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "7":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "8":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "9":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "10":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "11":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "12":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "13":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "14":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "15":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "16":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'SQProcNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "1":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "2":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "3":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "4":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "5":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "6":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "7":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "8":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "9":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "10":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "11":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "12":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "13":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "14":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "15":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "16":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'ZRProcNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "1":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "2":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "3":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "4":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "5":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "6":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "7":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "8":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "9":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "10":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "11":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "12":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "13":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "14":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "15":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "16":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'BadQtyEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                        case "1":
-
-                            break;
-                        case "2":
-
-                            break;
-                        case "3":
-
-                            break;
-                        case "4":
-
-                            break;
-                        case "5":
-
-                            break;
-                        case "6":
-
-                            break;
-                        case "7":
-
-                            break;
-                        case "8":
-
-                            break;
-                        case "9":
-
-                            break;
-                        case "10":
-
-                            break;
-                        case "11":
-
-                            break;
-                        case "12":
-
-                            break;
-                        case "13":
-
-                            break;
-                        case "14":
-
-                            break;
-                        case "15":
-
-                            break;
-                        case "16":
-                            //$(obj.tr).find(".layui-table-edit").keyup(function () {
-                            //    var $input = $(this), val = $input.val();
-                            //    if (!val) val = "1";
-                            //    $input.val(val.replace(/[^\d]/g, ''));
-                            //});
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'RemarkEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                        case "1":
-
-                            break;
-                        case "2":
-
-                            break;
-                        case "3":
-
-                            break;
-                        case "4":
-
-                            break;
-                        case "5":
-
-                            break;
-                        case "6":
-
-                            break;
-                        case "7":
-
-                            break;
-                        case "8":
-
-                            break;
-                        case "9":
-
-                            break;
-                        case "10":
-
-                            break;
-                        case "11":
-
-                            break;
-                        case "12":
-
-                            break;
-                        case "13":
-
-                            break;
-                        case "14":
-
-                            break;
-                        case "15":
-
-                            break;
-                        case "16":
-
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'PSProcNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "1":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "2":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "3":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "4":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "5":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "6":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "7":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "8":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "9":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "10":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "11":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "12":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "13":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "14":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "15":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                        case "16":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'CloseManEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                        case "1":
-
-                            break;
-                        case "2":
-
-                            break;
-                        case "3":
-
-                            break;
-                        case "4":
-
-                            break;
-                        case "5":
-
-                            break;
-                        case "6":
-
-                            break;
-                        case "7":
-
-                            break;
-                        case "8":
-
-                            break;
-                        case "9":
-
-                            break;
-                        case "10":
-
-                            break;
-                        case "11":
-
-                            break;
-                        case "12":
-
-                            break;
-                        case "13":
-
-                            break;
-                        case "14":
-
-                            break;
-                        case "15":
-
-                            break;
-                        case "16":
-
-                            break;
-                    }
-                }
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
             });
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
-                    type: "GET",
-                    data: {
-                        "HID": hID
+
+            // 琛屽唴浜嬩欢
+            table.on('tool(mainTable1)', function (obj) {
+                set_GridDelete1(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck1(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+            //淇濆吇璁″垝鍐呯爜
+            form.on('submit(HPlanInterpList)', function () {//閫夋嫨鍗曚綅
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '淇濆吇璁″垝鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
                     },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Sc_MouldMaintainBillList[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": data.鏃ユ湡
-                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
-                                , "HBeginDate": data.淇濆吇寮�濮嬫棩鏈�
-                                , "HEndDate": data.淇濆吇缁撴潫鏃ユ湡
-                                , "HExplanation": data.鎽樿
-                                , "HRemark": data.澶囨敞
-                                , "HPlanNo": data.淇濆吇璁″垝缂栧彿
-                                , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
-                                , "HMouldID": data.HMouldID
+                    end: function () {
 
-                            });
+                    },
+                    success: function (layero, index) {
 
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                    }
+                });
+            });
+
+            //浜у搧妯″叿
+            form.on('submit(HMouldList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧妯″叿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/MouldInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                        $("#HMouldName").val(checkStatus.data[0].HName);
+                        $("#HMouldID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
-            }
-
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3807' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HBeginDate").val(shijian);
-                        $("#HEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
-
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(HMateria-BT)', function () {//浜у搧
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-            //閫夋嫨宸ュ簭
-            form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
             });
 
-            //閫夋嫨閮ㄩ棬
-            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
             //閫夋嫨鍗曚綅
             form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
                 layer.open({
@@ -2351,61 +348,236 @@
                 })
             });
 
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HMaintainNumber')  //淇濆吇椤圭洰淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '淇濆吇椤圭洰鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/Gy_Maintain.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
 
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HMaintainItemID: checkStatus.data[0].HItemID,
+                                        HMaintainNumber: checkStatus.data[0].HNumber,
+                                        HMaintainItem: checkStatus.data[0].HName,
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        if (obj.event === 'HManagerNumber')  //璐d换浜轰俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐d换浜哄垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UserInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HManagerID: checkStatus.data[0].HItemID,
+                                        HManagerNumber: checkStatus.data[0].HNumber,
+                                        HManagerName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+
                     }
                 })
-            });
+            }
 
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck1(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HMaterNumber')  //閰嶄欢椤逛俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鐗╂枡鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/PartInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HMaterID: checkStatus.data[0].HItemID,
+                                        HMaterNumber: checkStatus.data[0].HNumber,
+                                        HMaterName: checkStatus.data[0].HName,
+                                        HMaterSpec: checkStatus.data[0].HModel,
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HUnitNumber')  //鍗曚綅淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '鍗曚綅鍒楄〃',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HUnitID: checkStatus.data[0].HItemID,
+                                        HUnitNumber: checkStatus.data[0].HNumber,
+                                        HUnitName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+
+                        if (obj.event === 'HManagerNumber')  //璐d换浜轰俊鎭�
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '璐d换浜哄垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/UserInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HManagerID: checkStatus.data[0].HItemID,
+                                        HManagerNumber: checkStatus.data[0].HNumber,
+                                        HManagerName: checkStatus.data[0].HName
+                                    });
+
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+
                     }
                 })
-            });
+            }
 
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-
-
+            //淇濆瓨
             form.on('submit(Saver)', function (data) {//淇濆瓨
                 //debugger;
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-
+                var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
+                var sMainSub = sMainStr + ';' + sSubStr + ';' + sSubStr1;
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+               
                 $.ajax(
                     {
                         type: "POST",
@@ -2422,148 +594,342 @@
                                 });
                             }
                             else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                layer.alert(data.Message, { icon: 5 });
                             }
                             layer.closeAll("loading");
                         },
                         error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
+                            layer.alert("閿欒:" + err, { icon: 5 });
                         }
                     });
             });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
 
-            }
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
 
-        });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        //杩斿洖鐗╂枡
-        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
-            $("#HMaterID").val(obj[0].HItemID);
-            $("#HMaterNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖宸ュ簭
-        function GetHProcValue(obj) {  //杩斿洖宸ュ簭
-            $("#HProcName").val(obj[0].宸ュ簭);
-            $("#HProcID").val(obj[0].HItemID);
-            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
-        }
-        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-            $("#HDepName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
-        }
-        //杩斿洖鍗曚綅
-        function GetHUnitNameValue(obj) {
-            $("#HUName").val(obj[0].HName);
-            $("#HUnitID").val(obj[0].HItemID);
-            $("#HUnitNumber").val(obj[0].HNumber);
-        }
+            //#endregion
 
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-            // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-        //    SQProcName = obj[0].宸ュ簭;
-        //    ProcID = obj[0].HItemID;
-        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
-        //    //$("#HProcID").val(obj[0].HItemID);
-        //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HBeginDate'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                });
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                Table1();  //淇濆吇椤瑰垪琛�
+                Table2();  //閰嶄欢椤瑰垪琛�
+
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //鍒濆鍖栦繚鍏婚」鍒楄〃
+            function Table1() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', hide: true }
+                    , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠g爜', edit: 'text', event: 'HMaintainNumber' }
+                    , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text' }
+                    , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text' }
+                    , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
+                    , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: 'HManagerNumber' }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
             }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //鍒濆鍖栭厤浠堕」鍒楄〃
+            function Table2() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao1', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HMaterID', title: '閰嶄欢ID', edit: 'text', hide: true }
+                    , { field: 'HMaterNumber', title: '閰嶄欢浠g爜', edit: 'text', event: "HMaterNumber" }
+                    , { field: 'HMaterName', title: '閰嶄欢鍚嶇О', edit: 'text' }
+                    , { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text' }
+                    , { field: 'HUnitID', title: '鍗曚綅ID', edit: 'text', hide: true }
+                    , { field: 'HUnitNumber', title: '鍗曚綅浠g爜', edit: 'text', event: "HUnitNumber" }
+                    , { field: 'HUnitName', title: '鍗曚綅鍚嶇О', edit: 'text' }
+                    , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', edit: 'text' }
+                    , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', edit: 'text' }
+                    , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text', hide: true }
+                    , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerNumber" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo1' }
+                ];
+                option2 = {
+                    id: 'mainTable1'
+                    , elem: '#mainTable1'
+                    , toolbar: '#toolbarDemo1'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
             }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [];
+                option2.data = [];
+                table.render(option);
+                table.render(option2);
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+                option2.data = [TabRow1];
+                table.render(option2);
             }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
+
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3819' },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HPlanInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+                        $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+                    }
+                });
+            }
+
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MouldMaintainBillList[0];
+                            form.val("component-form-group", {
+                                "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                                , "HBeginDate": formatDate(data.淇濆吇寮�濮嬫棩鏈�)
+                                , "HEndDate": formatDate(data.淇濆吇缁撴潫鏃ユ湡)
+                                , "HExplanation": data.鎽樿
+                                , "HRemark": data.澶囨敞
+                                , "HPlanNo": data.淇濆吇璁″垝缂栧彿
+                                , "HPlanInterID": data.淇濆吇璁″垝鍐呯爜
+                                , "HMouldID": data.HMouldID
+
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+
+                return [year, month, day].join('-');
+            }
+
+            // 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
+                $.ajax({
+                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
+                    type: "GET",
+                    data: { "HInterID": linterid },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+            }
+
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+
+            //澧炲姞涓�琛�
+            function btnAddLine1(NewRow) {
+                table.cache["mainTable1"].push(NewRow);
+                option2.data = table.cache["mainTable1"];
+                table.render(option2);
+            }
+
+            //澶嶅埗涓�琛�
+            function btnCopyLine1(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable1"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option2.data = table.cache["mainTable1"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option2);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
+            }
+
+            //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        var rowIndex = $(obj.tr).attr("data-index");
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        obj.del();
+                        option.data.splice(rowIndex, 1);//鍒犻櫎缂撳瓨鐨勮
+                        table.reload('mainTable',option);
+                        layer.close(index);
+                        
+                    });
+                }
+            }
+
+            //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete1(obj) {
+                var data = obj.data;
+                if (obj.event === 'del1') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        var rowIndex = $(obj.tr).attr("data-index");
+                        var oldData = table.cache["mainTable1"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        obj.del();
+                        oldData.splice(rowIndex, 1);//鍒犻櫎缂撳瓨鐨勮
+                        table.reload('mainTable1',oldData);
+                        layer.close(index);
+                    });
+                }
+            }
+
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                var Result = true;
+                if ($("#HMouldID").val() == '' || $("#HMouldID").val() == null) {
+                    layer.msg("浜у搧妯″叿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr =="[]") {
+                    layer.msg("淇濆吇椤规槑缁嗚褰曚笉鑳戒负绌�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return Result = false;
+                }
+                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                    sSubStr = JSON.parse(sSubStr);
+                    for (var i = 0; i < sSubStr.length; i++) {
+                        if (sSubStr[i].HMaintainItemID == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,淇濆吇椤圭洰淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HMaintainItem == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,淇濆吇閮ㄤ綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+                        if (sSubStr[i].HManagerNumber == "") {
+                            layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐d换浜轰俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            return Result = false;
+                        }
+
                     }
                 }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
+                else {
+                    return Result = true;
                 }
+                return Result;
             }
-            else {
-                return true;
-            }
-        }</script>
+            //#endregion
+        });
+    </script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
index 755f93c..093877b 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿鐐规璁板綍琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿鐐规璁板綍琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,224 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
-                    , { field: '鐐规璁″垝鍐呯爜', title: '鐐规璁″垝鍐呯爜', width: 200, hide: true }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
-                    , { field: '鐐规寮�濮嬫棩鏈�', title: '鐐规寮�濮嬫棩鏈�', width: 200 }
-                    , { 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: 115, hide: true }
-                    , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
-
+            //鍏敤鍙橀噺
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁板綍琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+            }
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '鐐规璁″垝缂栧彿', title: '鐐规璁″垝缂栧彿', width: 200 }
+                        , { field: '鐐规璁″垝鍐呯爜', title: '鐐规璁″垝鍐呯爜', width: 200, hide: true }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: '鐐规寮�濮嬫棩鏈�', title: '鐐规寮�濮嬫棩鏈�', width: 200 }
+                        , { 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: 115, hide: true }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            };
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁板綍琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            };
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckBillList.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldDotCheckBill/DeltetSc_MouldDotCheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            };
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
+                    url: GetWEBURL() + '/Sc_MouldDotCheckBill/GetMouldDotCheckBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
+            }
         });
 
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
index d552346..5b7dbc5 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldDotCheckPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿鐐规璁″垝琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿鐐规璁″垝琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -117,252 +117,216 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
-
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { 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 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '澶囨敞', title: '澶囨敞', width: 200 }
-                    , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
-                    , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
-                    , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 }
-                    , { 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 }
-                    , { 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 }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍏敤鍙橀噺
+            var option = [];
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿鐐规璁″垝琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿鐐规璁″垝琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { 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 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '澶囨敞', title: '澶囨敞', width: 200 }
+                        , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+                        , { field: '鐐规閮ㄤ綅', title: '鐐规閮ㄤ綅', width: 200 }
+                        , { field: '鍏蜂綋瑕佹眰', title: '鍏蜂綋瑕佹眰', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 115 }
+                        , { 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 }
+                        , { 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 }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+            var index = layer.load(0);
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            function get_Display(sWhere) {
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
+                    url: GetWEBURL() + '/Sc_MouldDotCheckPlanBill/GetMouldDotCheckPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿鐐规璁″垝琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+                    }
+                });
+            }
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿鐐规璁″垝琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldDotCheckPlanBillList.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldDotCheckPlanBill/DeltetSc_MouldDotCheckPlanBillBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
 
-
-            //浠ヤ笂鏄痩ayui妯″潡
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
         });
-
-
-
-
     </script>
 
 </body>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
index c1df757..e3c9329 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainBillList.html"
@@ -28,7 +28,7 @@
                                         <span>鏇村</span>
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
+                                <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
                                         <select name="HBillType" id="HBillType">
@@ -49,12 +49,12 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                     </div>
-                                </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">
+                                <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>
@@ -72,7 +72,7 @@
                                             <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                         </div>
                                     </div>
-                                </div>-->
+                                </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -82,12 +82,12 @@
                                 <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="btn-reload"><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"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><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"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
 
                             </div>
                         </script>
@@ -106,6 +106,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            // #region 鍏ㄥ眬鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -117,253 +118,270 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
-                    , { field: '淇濆吇璁″垝鍐呯爜', title: '淇濆吇璁″垝鍐呯爜', width: 200 }
-                    , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
-                    , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
-                    , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
-                    , { field: '淇濆吇寮�濮嬫棩鏈�', title: '淇濆吇寮�濮嬫棩鏈�', width: 200 }
-                    , { 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: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
-                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
-                    , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 115 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+             set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0);
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁板綍琛�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET", 
-                                    url: GetWEBURL() + "/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
 
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
             });
 
-            //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
-                //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
-                //}
-                var index = layer.load(0);
+         //#endregion
+
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '淇濆吇璁″垝缂栧彿', title: '淇濆吇璁″垝缂栧彿', width: 200 }
+                        , { field: '淇濆吇璁″垝鍐呯爜', title: '淇濆吇璁″垝鍐呯爜', width: 200 }
+                        , { field: 'HMouldID', title: 'HMouldID', width: 200, hide: true }
+                        , { field: '浜у搧妯″叿浠g爜', title: '浜у搧妯″叿浠g爜', width: 200 }
+                        , { field: '浜у搧妯″叿', title: '浜у搧妯″叿', width: 200 }
+                        , { field: '淇濆吇寮�濮嬫棩鏈�', title: '淇濆吇寮�濮嬫棩鏈�', width: 200 }
+                        , { 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: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
+                        , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
+                        , { field: '瀹為檯鐢ㄩ噺', title: '瀹為檯鐢ㄩ噺', width: 115 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
+                    url: GetWEBURL() + '/Sc_MouldMaintainBill/GetMouldMaintainBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
+                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                if (HBillNo) {
+                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+                }
+                if (HCreateBy) {
+                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
+                }
+                if (BenginHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
+                }
+                if (EndHCreateDate) {
+                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HBillType").val("");//鍗曟嵁绫诲瀷
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HCreateBy").val("");//鍒跺崟浜�
+                $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+                $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+                $("#btnSearch").click();
                 sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //鏂板
+            function set_AddNew()
+            {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁板綍琛�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            }
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁板綍琛�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
index 6d7ce93..16ba120 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>妯″叿淇濆吇璁″垝琛ㄥ垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>妯″叿淇濆吇璁″垝琛ㄥ垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,246 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
-                    , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
-                    , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
-                    , { 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: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
-                    , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
-                    , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
-                    , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 115 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
-                    , { 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板妯″叿淇濆吇璁″垝鍗�',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妯″叿淇濆吇璁″垝鍗�'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-                       
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '鍛ㄦ湡鍗曚綅', title: '鍛ㄦ湡鍗曚綅', width: 200 }
+                        , { field: '淇濆吇鍛ㄦ湡', title: '淇濆吇鍛ㄦ湡', width: 200 }
+                        , { field: '璁″垝寮�濮嬫棩鏈�', title: '璁″垝寮�濮嬫棩鏈�', width: 200 }
+                        , { 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: 'hmaterid', title: 'hmaterid', width: 115, hide: true }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 200 }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 200 }
+                        , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 200 }
+                        , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200 }
+                        , { field: '鏍囧噯鐢ㄩ噺', title: '鏍囧噯鐢ㄩ噺', width: 115 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 115 }
+                        , { 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿淇濆吇璁″垝鍗�',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            };
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妯″叿淇濆吇璁″垝鍗�'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妯℃不鍏风鐞�/Sc_Add_MouldMaintainPlanBillList.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            };
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sc_MouldMaintainPlanBill/DeltetMouldMaintainPlanBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            };
+             //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+                    url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+            }
+            //瀹℃牳
+            function set_CheckBill() {
+            }
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index 631d1e7..d4807f2 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -87,6 +88,8 @@
                             <div class="layui-btn-group">
 
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
+                                <button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">鍙嶅鏍�</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -108,7 +111,7 @@
                                                         <div class="layui-input-inline">
                                                             <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" disabled autocomplete="off">
                                                             <input id="HInterID" name="HInterID" type="hidden" />
-                                                            
+
                                                         </div>
                                                     </div>
                                                     <div class="layui-inline">
@@ -333,20 +336,16 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        var refSav = "";   //鎻愪氦绫诲瀷
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -363,6 +362,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -370,72 +370,79 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HWorkBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HWorkReportDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鎶ュ伐鏃ユ湡
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3724' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                var HICMOInID = params[params[3]];//鐢熶骇璁㈠崟涓讳富ID
+                var HICMOEnID = params[params[4]];//鐢熶骇璁㈠崟瀛怚D
+                set_EditFromGrid(linterid, HICMOInID, HICMOEnID);
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HWorkBeginDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HWorkReportDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew()
+            {
+
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
-            {
+            function set_AddNew() {
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鎶ュ伐鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HICMOBillNo').attr("disabled", true);
@@ -445,13 +452,13 @@
                 $('#HMaterCode').attr("disabled", true);
                 $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HMaterName').attr("disabled", true);
-                $('#HMaterSpec').attr("disabled", true); 
-                $('#HPlanQty').attr("disabled", true); 
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HPlanQty').attr("disabled", true);
                 $('#HSourceName').attr("disabled", true);
                 $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
                 $('#HWorkBeginDate').attr("disabled", true);
                 $('#HWorkReportDate').attr("disabled", true);
-             
+
                 $.ajax(
                     {
                         type: "GET",
@@ -480,14 +487,14 @@
                                 $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
                                 $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
                                 $("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
-                                $("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
-                                $("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
+                                $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+                                $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
                                 $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
                                 $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
                                 $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
                                 $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
                                 $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
-                             
+
                             }
                             else {
                                 layer.alert(data.Message, { icon: 5 });
@@ -500,21 +507,157 @@
                     });
             }
 
-            //淇濆瓨鎻愪氦
-            form.on('submit(Saver)', function (data)
+            //缂栬緫
+            function set_EditFromGrid(linterid, HICMOInID, HICMOEnID)
             {
+                refSav = "Update";
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HSourceBillNo').attr("disabled", true);
+                $('#HProcExchBillNo').attr("disabled", true);
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HPlanQty').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HWorkBeginDate').attr("disabled", true);
+                $('#HWorkReportDate').attr("disabled", true);
+               
+                $.ajax(
+                    {
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESProductReportBill/Get_Sc_MESProductReportEditBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: {
+                            "linterid": linterid,
+                            "HICMOInID": HICMOInID,
+                            "HICMOEnID": HICMOEnID,
+                        },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            {
+                                var LoadData = data.data.h_v_IF_ICMOBillWorkQtyStatus_Tmp;
+                                $("#HInterID").val(LoadData[0].HInterID); //鍗曟嵁ID
+                                $("#HBillNo").val(LoadData[0].鍗曟嵁鍙�); //鍗曟嵁鍙�
+                                $("#HDate").val(formatDate(LoadData[0].鏃ユ湡)); //鏃ユ湡
+                                $("#HProcID").val(""); //褰撳墠宸ュ簭ID
+                                $("#HProcName").val(""); //褰撳墠宸ュ簭
+                                $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
+                                $("#HMaterCode").val(LoadData[0].浜у搧浠g爜); //浜у搧浠g爜
+                                $("#HMaterName").val(LoadData[0].浜у搧鍚嶇О); //浜у搧鍚嶇О
+                                $("#HMaterSpec").val(LoadData[0].浜у搧瑙勬牸); //浜у搧瑙勬牸
+                                $("#HSourceID").val(LoadData[0].HSourceID); //鐢熶骇璧勬簮ID
+                                $("#HSourceName").val(LoadData[0].鐢熶骇璧勬簮); //鐢熶骇璧勬簮
+                                $("#HSourceBillNo").val(LoadData[0].婧愬崟鍗曞彿); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
+                                $("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+                                $("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
+                                $("#HSourceBillType").val(LoadData[0].婧愬崟绫诲瀷); //婧愬崟绫诲瀷
+                                $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+                                $("#HGroupName").val(LoadData[0].鐢熶骇鐝粍); //鐝粍
+                                $("#HWorkManID").val(LoadData[0].HWorkManID); //鎿嶄綔鍛業D
+                                $("#HWorkManName").val(LoadData[0].鎿嶄綔鍛�); //鎿嶄綔鍛�
+                                $("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
+                                $("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
+                                $("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
+                                $("#HWorkBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
+                                $("#HWorkReportDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
+                                $("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
+                                $("#HQty").val(LoadData[0].姹囨姤鏁伴噺); //鎶ュ伐鏁伴噺
+                                $("#HBadQty").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
+                                $("#HWasterQty").val(LoadData[0].鎶ュ簾鏁伴噺); //鎶ュ簾鏁伴噺
+                                $("#HMaker").val(LoadData[0].鍒跺崟浜�); //鍒跺崟浜�
+                                $("#HMakeDate").val(formatDate(LoadData[0].鍒跺崟鏃ユ湡)); //鍒跺崟鏃ユ湡
+                                $("#HUpDater").val(sessionStorage["HUserName"]); //淇敼浜�
+                                $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //淇敼鏃ユ湡
+                                $("#HChecker").val(LoadData[0].瀹℃牳浜�); //瀹℃牳浜�
+                                $("#HCheckDate").val(formatDate(LoadData[0].瀹℃牳鏃ユ湡)); //瀹℃牳鏃ユ湡
+                                $("#HCloseMan").val(LoadData[0].鍏抽棴浜�); //鍏抽棴浜�
+                                $("#HCloseDate").val(formatDate(LoadData[0].鍏抽棴鏃ユ湡)); //鍏抽棴鏃ユ湡
+                                $("#HDeleteMan").val(LoadData[0].浣滃簾浜�); //浣滃簾浜�
+                                $("#HDeleteDate").val(formatDate(LoadData[0].浣滃簾鏃ユ湡)); //浣滃簾鏃ユ湡
+
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+
+                            }
+                        },
+                        error: function (err) {
+                            layer.alert(err, { icon: 5 });
+                        }
+                    });
+            }
+
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3724' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+            //缂栬緫鑾峰彇琛ㄤ綋鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1).toString(),
+                    day = '' + d.getDate().toString(),
+                    year = d.getFullYear().toString(),
+                    h = d.getHours().toString(),
+                    mm = d.getMinutes().toString(),
+                    s = d.getSeconds().toString();
+
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
+                if (h.length < 2) h = '0' + h;
+                if (mm.length < 2) mm = '0' + mm;
+                if (s.length < 2) s = '0' + s;
+
+                return [year, month, day].join('-') + " " + [h, mm, s].join(':');
+            }
+
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
                 }
                 OverStepQty(data);
-              
+
             });
+
+            //瀹℃牳
+            form.on('submit(VerIfySaver)', function (data)
+            {
+                SaveVerify();
+            });
+            //鍙嶅鏍�
+            form.on('submit(ReVerIfySaver)', function (data)
+            {
+                ReVerIfySaver();
+            });
+
 
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
             });
 
 
@@ -678,6 +821,13 @@
             //楠岃瘉姹囨姤鏁伴噺鏄惁瓒呰繃璁″垝鏁伴噺
             function OverStepQty(data) {
                 var sWhere = "";
+                if (OperationType == 3) //缂栬緫
+                {
+                    HSourceInterID = $("#HSourceInterID").val();
+                    HSourceEntryID = $("#HSourceEntryID").val();
+                    HSourceBillNo = $("#HSourceBillNo").val();
+                    HSourceBillType = $("#HSourceBillType").val();
+                }
                 sWhere = " where  HSourceID='" + $("#HSourceID").val() + "' and  HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
                 $.ajax({
                     url: GetWEBURL() + "/Sc_MESBeginWorkBill/GetMESOverStepQty",
@@ -693,12 +843,12 @@
                         var yessqty = HQty + HBadQty + HWasterQty;
                         var sumqty = parseFloat($("#HQty").val()) + yessqty;
                         if (sumqty > parseFloat($("#HPlanQty").val())) {
-                            layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆�,纭瑕佹彁浜ゅ悧锛�", {
+                            layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆戯紒", {
                                 btn: ['纭', '鍙栨秷']
                             }, function (index) {
                                 //鍏抽棴褰撳墠frame
                                 layer.close(index);
-                                Submit(data);
+                                //Submit(data);
                             }, function () {
 
                             });
@@ -714,8 +864,7 @@
             }
 
             //鎻愪氦璇锋眰ajax
-            function Submit(data)
-            {
+            function Submit(data) {
                 if (data.field.HBadQty == "" || data.field.HBadQty == null) {
                     data.field.HBadQty = 0;
                 }
@@ -723,19 +872,28 @@
                     data.field.HWasterQty = 0;
                 }
                 var sMainStr = JSON.stringify(data.field);
-            
+                var sMainSub = sMainStr + ';' + refSav;
 
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainStr },
+                    async: false,
+                    data: { "msg": sMainSub },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    layer.close(index);
+                                    SaveVerify(); //瀹℃牳
+                                }
+                                else {
+                                    layer.close(index);
+                                }
                             });
                         }
                         else {
@@ -747,11 +905,78 @@
                     }
                 })
             }
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify()
+            {
+                var HSourceID = $("#HSourceID").val();  //鐢熶骇璧勬簮ID
+                var HSourceInterID = $("#HSourceInterID").val(); //婧愬崟涓诲唴鐮�
+                var HSourceEntryID = $("#HSourceEntryID").val();//婧愬崟瀛愬唴鐮�
+                var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                var HICMOInterID = $("#HICMOInterID").val();//鐢熶骇璁㈠崟涓籌D
+                var HICMOEntryID = $("#HICMOEntryID").val();//鐢熶骇璁㈠崟瀛怚D
+                var HInterID = $("#HInterID").val();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //鍙嶅鏍告彁浜�
+            function ReVerIfySaver()
+            {
+                var HSourceID = $("#HSourceID").val();  //鐢熶骇璧勬簮ID
+                var HSourceInterID = $("#HSourceInterID").val(); //婧愬崟涓诲唴鐮�
+                var HSourceEntryID = $("#HSourceEntryID").val();//婧愬崟瀛愬唴鐮�
+                var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+                var HICMOInterID = $("#HICMOInterID").val();//鐢熶骇璁㈠崟涓籌D
+                var HICMOEntryID = $("#HICMOEntryID").val();//鐢熶骇璁㈠崟瀛怚D
+                var HInterID = $("#HInterID").val();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                //閫昏緫瀹℃牳鏂规硶
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
+
+                            });
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
             //浠ヤ笂涓簂ayui妯″潡
         });
 
-         //闈炵┖楠岃瘉
-        function AllowLoadData() { 
+        //闈炵┖楠岃瘉
+        function AllowLoadData() {
             var Result = true;
             if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
                 layer.msg("鍗曟嵁鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -788,7 +1013,7 @@
             if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
                 layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
-            }          
+            }
             if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                 layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
@@ -796,9 +1021,9 @@
             return Result;
         }
 
-       
 
-      
+
+
     </script>
 </body>
 </html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index 73e6d93..7e3adf8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -13,7 +13,12 @@
             padding-right: 15px;
             cursor: pointer;
         }
-      
+        #top-title 
+        {
+            margin: 0 30%;
+            font-size: 24px;
+            font-weight: bold;
+        }
     </style>
     <script src="../../../layuiadmin/layui/layui.js"></script>
 
@@ -24,10 +29,10 @@
             <div class="layui-card" style="padding: 1px">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div class="layui-card-header">
-                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Delete"><i class="layui-icon layui-icon-add"></i>鍒犻櫎</button>
+                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Delete" id="Delete"><i class="layui-icon layui-icon-add"></i>鍒犻櫎</button>
                         <button type="button" class="layui-btn" lay-submit="" lay-filter="AskReport" id="AskReport"><i class="layui-icon layui-icon-add"></i>鐢宠妫�楠�</button>
-                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Exit"><i class="layui-icon layui-icon-add"></i>閫�鍑�</button>
-                        <span style="margin:0 30%;font-size:24px;font-weight:bold;">浜ч噺姹囨姤</span>
+                        <button type="button" class="layui-btn" lay-submit="" lay-filter="Exit" id="Exit"><i class="layui-icon layui-icon-add"></i>閫�鍑�</button>
+                        <span  id="top-title">浜ч噺姹囨姤</span>
                     </div>
                     <div class="layui-card-body" style="padding: 1px;">
 
@@ -113,6 +118,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
         //鑾峰彇鍙傛暟
         var workcode = "";  //宸ュ崟鍙�
@@ -121,21 +127,6 @@
         var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
         var HSourceBillType = ""; //婧愬崟绫诲瀷
         var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
-
         var edit = function (data) {
             workcode = data[0].workcode;
             HSourceID = data[0].HSourceID;
@@ -146,12 +137,24 @@
             Czybm = data[0].Czybm;
             HSourceBillType = data[0].HSourceBillType;
         }
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+      
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -162,49 +165,74 @@
                 , laydate = layui.laydate
 
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                ,height: 'full-50'
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                     { type: 'checkbox', fixed: 'left' }
-                    , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200}
-                    , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200}
-                    , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
-                    , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
-                    , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true}
-                    , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true}
-                    , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
-                    , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true}
-                    , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true}
-                    , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true}
-                    , { field: 'HMaterCode', title: '浜у搧浠g爜', width: 200 }
-                    , { field: 'HMaterName', title: '浜у搧鍚嶇О', width: 200 }
-                    , { field: 'HMaterSpec', title: '浜у搧瑙勬牸', width: 200 }
-                    , { field: 'HQty', title: '姹囨姤鏁伴噺', width: 200 }
-                    , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true}
-                    , { field: 'HSourceCode', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
-                    , { field: 'HSourceName', title: '鐢熶骇璧勬簮', width: 200 }
-                    , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true}
-                    , { field: 'HGroupCode', title: '鐢熶骇鐝粍浠g爜', width: 200 }
-                    , { field: 'HGroupName', title: '鐢熶骇鐝粍鍚嶇О', width: 200 }
-                    , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true}
-                    , { field: 'HWorkManName', title: '鎿嶄綔鍛�', width: 200 }
-                    , { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
-                    , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
-                ]]
-            };
-           
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+           if (OperationType == 2) {//鏈夋簮鍗�
+
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_AddNew();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
             {
-                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null"?0: HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
+                 option = {
+                    elem: '#mainTable'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, width: 200 }
+                        , { field: 'HDate', title: '鏃ユ湡', width: 200, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
+                        , { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200 }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200}
+                        , { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
+                        , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
+                        , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+                        , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
+                        , { field: 'HMaterCode', title: '浜у搧浠g爜', width: 200 }
+                        , { field: 'HMaterName', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: 'HMaterSpec', title: '浜у搧瑙勬牸', width: 200 }
+                        , { field: 'HQty', title: '姹囨姤鏁伴噺', width: 200 }
+                        , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true }
+                        , { field: 'HSourceCode', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
+                        , { field: 'HSourceName', title: '鐢熶骇璧勬簮', width: 200 }
+                        , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true }
+                        , { field: 'HGroupCode', title: '鐢熶骇鐝粍浠g爜', width: 200 }
+                        , { field: 'HGroupName', title: '鐢熶骇鐝粍鍚嶇О', width: 200 }
+                        , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, hide: true }
+                        , { field: 'HWorkManName', title: '鎿嶄綔鍛�', width: 200 }
+                        , { field: 'HMaker', title: '鍒跺崟浜�', width: 200 }
+                        , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
+                    ]]
+                };
+            }
+
+            //鎶ュ伐骞冲彴杩涘叆(鏈夋簮鍗�)
+            function set_AddNew()
+            {
+                sWhere = " where a.HSourceID='" + HSourceID + "' and a.HICMOBillNo='" + workcode + "' and HICMOInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' and HICMOEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and HMaker='" + HMaker + "' ";
                 SchWhere = sWhere;
                 console.log(sWhere);
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
@@ -216,19 +244,18 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            
+
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                         sWhere = "";
                     }, error: function () {
-                        
+
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
             }
-           
 
             //鍒犻櫎鎸夐挳
             form.on('submit(Delete)', function (data)
@@ -237,12 +264,14 @@
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
                     var InterID = data[0].HInterID.toString();
+                    var HICMOInID = data[0].HICMOInterID.toString();
+                    var HICMOEnID = data[0].HICMOEntryID.toString();
                     //閫昏緫鍒犻櫎鏂规硶
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         $.ajax({
                             type: "GET",
                             url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            data: { "HInterID": InterID, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID },
+                            data: { "HInterID": InterID, "HICMOInterID": HICMOInID, "HICMOEntryID": HICMOEnID },
                             success: function (result) {
                                 if (result.count == 1) {
                                     layer.msg(result.Message, { time: 1 * 2000, icon: 1 });
@@ -271,7 +300,7 @@
 
             //鐢宠妫�楠�
             form.on('submit(AskReport)', function (data)
-            {               
+            {
                 var TabData = table.cache['mainTable'];
                 if (TabData == undefined)
                 {
@@ -281,9 +310,11 @@
                 if (TabData.length <= 0) {
                     return layer.alert("鏃犱骇閲忔眹鎶ユ暟鎹紒", { icon: 5 })
                 }
+                //鍒ゆ柇鏄惁鏈夋湭瀹℃牳鏁版嵁
+
                 $.ajax(
                     {
-                        type: "GET",
+                        type: "Get",
                         url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                         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 },
@@ -312,10 +343,9 @@
             })
 
             //閫�鍑�
-            //鍒犻櫎鎸夐挳
-            form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            form.on('submit(Exit)', function (data)
+            {
+               Pub_Close(1);  //鍏抽棴寮圭獥
             })
 
 
@@ -329,15 +359,13 @@
             });
 
             //鏌ヨ鎸夐挳
-            if (Type == 2) {
-                form.on('submit(btnSearch)', function (data) {
+            form.on('submit(btnSearch)', function (data) {
                     var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                     var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                     var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
                     var Part = $("#Part").val();       //鐗╂枡淇℃伅
                     var Source = $("#Source").val();  //璧勬簮
                     sWhere += SchWhere;
-                    
                     if (HDate) {
                         sWhere += " and CONVERT(varchar(100),a.HDate, 23) >= '" + HDate + "'";
                     }
@@ -362,7 +390,7 @@
                             if (data1.count == 1) {
                                 option.data = data1.data;
                                 table.render(option);
-                                layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+
                             } else {
                                 layer.alert(data1.code + data1.Message, { icon: 5 });
                             }
@@ -372,7 +400,8 @@
                     });
                     sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
                 });
-            }
+
+           // #endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
@@ -389,7 +418,6 @@
                     ScMaxWork = d.data[0].HBillNo;
                 }
             });
-            console.log(ScMaxWork);
             return ScMaxWork;
         }
     </script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html"
new file mode 100644
index 0000000..68fcb63
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList_Web.html"
@@ -0,0 +1,538 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>浜ч噺姹囨姤鍗曞垪琛�</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style>
+        .layui-form-select .layui-input {
+            padding-right: 15px;
+            cursor: pointer;
+        }
+
+        #top-title {
+            margin: 0 30%;
+            font-size: 24px;
+            font-weight: bold;
+        }
+    </style>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <form class="layui-form" action="" lay-filter="component-form-group">
+                    <div class="layui-card-header">
+                        <span id="top-title">浜ч噺姹囨姤鍗�</span>
+                    </div>
+                    <div class="layui-card-body" style="padding: 1px;">
+
+
+                        <div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-colla-title 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="date" class="layui-input" id="HDate" 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="HDate1" 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="HBillNo" id="HBillNo" 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="Part" id="Part" 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="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add" disabled><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></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>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" style="display:none;"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" style="display:none;"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+
+
+                            </div>
+                        </script>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var workcode = "";  //宸ュ崟鍙�
+        var HSourceID = ""; //璧勬簮ID
+        var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
+        var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+        var HSourceBillType = ""; //婧愬崟绫诲瀷
+        var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
+
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } 
+
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+            //#region 鍏敤鍙橀噺
+            var $ = layui.$
+            , admin = layui.admin
+            , layer = layui.layer
+            , table = layui.table
+            , form = layui.form
+            , element = layui.element
+            , laypage = layui.laypage
+                , laydate = layui.laydate
+
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+           if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+               set_ClearBill();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板鎸夐挳
+                    case 'btn-Add': //set_AddNew();
+                        break;
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_AbandonCheck();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(1);
+                        break;
+                };
+            });
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HBillNo").val("");
+                $("#Part").val("");
+                $("#Source").val("");
+            });
+        //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                 
+                $("#top-title").css({ margin: "0 46%"});
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                     elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true, 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: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 200 }
+                        , { field: 'HMaterID', title: '浜у搧ID', width: 200, hide: true }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 200 }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸', width: 200 }
+                        , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺', width: 200 }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
+                        , { field: 'HICMOInterID', title: '鐢熶骇璁㈠崟涓籌D', width: 200, hide: true }
+                        , { field: 'HICMOEntryID', title: '鐢熶骇璁㈠崟瀛怚D', width: 200, hide: true }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 200 }
+                        , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200, hide: true }
+                        , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200, hide: true }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', width: 200, hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜', width: 200 }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮', width: 200 }
+                        , { field: 'HGroupID', title: '鐢熶骇鐝粍ID', width: 200, hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜', width: 200 }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍', width: 200 }
+                        , { field: 'HWorkManID', title: '鎿嶄綔鍛業D', width: 200, 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, 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, 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: 'HReportType', title: '姹囨姤绫诲瀷', width: 200 }
+                        , { field: 'HRelationInterID', title: '鏄惁鎶ユ鐢宠', width: 200, hide: true }
+                    ]]
+                };
+            }
+
+            //鏌ヨ鏁版嵁
+            function get_Display(sWhere)
+            {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Sc_MESProductReportBill/Get_Sc_MESProductReportBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            // 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
+                var Part = $("#Part").val();       //鐗╂枡淇℃伅
+                var Source = $("#Source").val();  //璧勬簮
+                sWhere += SchWhere;
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (Part) {
+                    sWhere += " and concat(浜у搧浠g爜,浜у搧鍚嶇О,浜у搧瑙勬牸) like '%" + Part + "%'";
+                }
+                if (Source) {
+                    sWhere += " and 鐢熶骇璧勬簮 like '%" + Dept + "%'";
+                }
+
+                get_Display(sWhere);
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            }
+
+            //鏂板
+            function set_AddNew()
+            {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    area: ['100%', '100%'],
+                    title: '浜ч噺姹囨姤-鏂板',
+                    shift: 0,
+                    content: '../浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    console.log(data[0]);
+                    var HInterID = data[0].HInterID;
+                    var HICMOInID = data[0].HICMOInterID;
+                    var HICMOEnID = data[0].HICMOEntryID;
+                    var HRelationInterID = data[0].HRelationInterID;
+                    if (HRelationInterID == 1) {
+                        layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶淇敼锛�');
+                        return false;
+                    }
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫浜ч噺姹囨姤'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=&HICMOInID=' + HICMOInID + '&HICMOEnID=' + HICMOEnID + '&HRelationInterID=' + HRelationInterID+''
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎鎸夐挳
+            function set_DeleteBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].HInterID.toString();
+                    var HICMOInID = data[0].HICMOInterID.toString();
+                    var HICMOEnID = data[0].HICMOEntryID.toString();
+                    var HRelationInterID = data[0].HRelationInterID.toString();
+                    if (HRelationInterID == 1) {
+                        layer.msg('鍗曟嵁宸叉姤妫�瀹℃牳鏃犳硶鍒犻櫎锛�');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESProductReportBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "HICMOInterID": HICMOInID, "HICMOEntryID": HICMOEnID, "UserName": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 2000, icon: 1 });
+                                    table.reload('mainTable', {
+                                        page: {
+                                            curr: 1 //閲嶆柊浠庣涓�椤靛紑濮�
+                                        }
+                                    })
+                                    return false;
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    return false;
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                return false;
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //瀹℃牳
+            function set_CheckBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HSourceID = data[0].HSourceID.toString();  //鐢熶骇璧勬簮ID
+                    var HSourceInterID = data[0].HSourceInterID.toString(); //婧愬崟涓诲唴鐮�
+                    var HSourceEntryID = data[0].HSourceEntryID.toString();//婧愬崟瀛愬唴鐮�
+                    var HSourceBillNo = data[0].婧愬崟鍗曞彿;//婧愬崟鍗曞彿
+                    var HICMOInterID = data[0].HICMOInterID.toString();//鐢熶骇璁㈠崟涓籌D
+                    var HICMOEntryID = data[0].HICMOEntryID.toString();//鐢熶骇璁㈠崟瀛怚D
+                    var HInterID = data[0].HInterID.toString();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+                    if (HBillStatus > 0)
+                    {
+                        layer.msg('鍗曟嵁涓嶄负鏈鏍哥姸鎬侊紒');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_AbandonCheck()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HBillStatus = data[0].HBillStatus.toString(); //鍗曟嵁鐘舵��
+                    var HSourceID = data[0].HSourceID.toString();  //鐢熶骇璧勬簮ID
+                    var HSourceInterID = data[0].HSourceInterID.toString(); //婧愬崟涓诲唴鐮�
+                    var HSourceEntryID = data[0].HSourceEntryID.toString();//婧愬崟瀛愬唴鐮�
+                    var HSourceBillNo = data[0].婧愬崟鍗曞彿;//婧愬崟鍗曞彿
+                    var HICMOInterID = data[0].HICMOInterID.toString();//鐢熶骇璁㈠崟涓籌D
+                    var HICMOEntryID = data[0].HICMOEntryID.toString();//鐢熶骇璁㈠崟瀛怚D
+                    var HInterID = data[0].HInterID.toString();//浜ч噺姹囨姤涓存椂琛ㄤ富ID
+                    if (HBillStatus = 0 || HBillStatus>2) {
+                        layer.msg('鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳鎴栬�呭崟鎹凡鐢熸晥涓嶅厑璁稿弽瀹℃牳锛�');
+                        return false;
+                    }
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/MESProductAuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HSourceID": HSourceID, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HSourceBillNo": HSourceBillNo, "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID, "HInterID": HInterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+
+            }
+
+
+           // #endregion
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+
+       
+    </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 7b5486f..75fc162 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -66,13 +66,13 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><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"><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"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_pushDown" id="set_pushDown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
                             </div>
                         </script>
                     </form>
@@ -103,13 +103,14 @@
 
             var option = {
                 elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
+                , toolbar: '#toolbarDemo'
                 ,height: 'full-50' 
                 , page: true
                 ,cellMinWidth: 90
                 , cols: [[
+                    { type: 'checkbox', fixed: 'left' }
                     //{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
-                    { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+                    , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
                     , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
                     , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 105 }
                     //, { field: 'HDeptID', title: 'HDeptID' }
@@ -238,7 +239,32 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //涓嬫帹
+                    case 'set_pushDown': set_pushDown();
+                        break;
+                };
+            });
 
+            //涓嬫帹鍗曟嵁
+            function set_pushDown() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ュ簭娴佽浆鍗�-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../../杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3772'
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
             //laydate.render({
             //    elem: '#HDate'
             //    , type: 'datetime'
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 0a49c22..d2ecf76 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -87,6 +88,7 @@
                             <div class="layui-btn-group">
 
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -335,20 +337,16 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        var refSav = "";   //鎻愪氦绫诲瀷
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -365,6 +363,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -372,72 +371,82 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HStopBeginWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HStopEndWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            // #region 椤甸潰鍒濆鍖�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HStopBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�濮嬫椂闂�
-            $("#HStopEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鏈夐璁$粨鏉熸椂闂�
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3702' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉� 
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HStopBeginWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HStopEndWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2) {
+            function set_AddNew() {
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HStopBeginWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�濮嬫椂闂�
+                $("#HStopEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //鏈夐璁$粨鏉熸椂闂�
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HProcName').attr("disabled", true);
@@ -470,7 +479,7 @@
                             if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             {
                                 var LoadData = data.data.h_p_JIT_GetInfoByICMOStatusInterID;
-                          
+
                                 $("#HProcID").val(LoadData[0].HProcID); //褰撳墠宸ュ簭ID
                                 $("#HProcName").val(LoadData[0].HProcName); //褰撳墠宸ュ簭
                                 $("#HMaterID").val(LoadData[0].HMaterID); //浜у搧ID
@@ -500,10 +509,109 @@
                     });
             }
 
+            //缂栬緫
+            function set_EditFromGrid() {
+                refSav = "Update";
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HStopBeginWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MESStopWorkBill/Sc_MESStopWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESStopWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HStopBeginWorkTime": data.寮�濮嬪仠宸ユ椂闂�
+                                , "HStopEndWorkTime": data.缁撴潫鍋滃伐鏃堕棿
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D(琛屽彿)
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HStopReason": data.鍋滃伐鍘熷洜                         //鍋滃伐鍘熷洜
+                                , "HRemark": data.澶囨敞                            //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+
+          
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3702' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
 
             //淇濆瓨鎻愪氦
             form.on('submit(Saver)', function (data) {
                 var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
@@ -511,14 +619,23 @@
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainStr },
+                    async: false,
+                    data: { "msg": sMainSub },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    layer.close(index);
+                                    SaveVerify(); //瀹℃牳
+                                }
+                                else {
+                                    layer.close(index);
+                                }
                             });
                         }
                         else {
@@ -531,10 +648,45 @@
                 })
             });
 
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify() {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
+                window.parent.location.reload();
             });
 
 
@@ -731,11 +883,23 @@
                 });
             });
 
-
+            //#endregion
 
             //浠ヤ笂涓簂ayui妯″潡
         });
 
+        function formatDate(date) {
+            var d = new Date(date),
+                month = '' + (d.getMonth() + 1),
+                day = '' + d.getDate(),
+                year = d.getFullYear();
+
+            if (month.length < 2) month = '0' + month;
+            if (day.length < 2) day = '0' + day;
+
+            return [year, month, day].join('-');
+        }
+
         function AllowLoadData() {  //闈炵┖楠岃瘉
             var Result = true;
             if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
index 234154c..9c884f9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
@@ -36,11 +36,23 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
-                                <!--<div class="layui-inline">
-                                    <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                     </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
+                                <!--<div class="layui-inline">
+                                      <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                      <div class="layui-input-block">
+                                          <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+                                      </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>
@@ -53,23 +65,20 @@
                                             <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="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+                               
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <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 layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -81,12 +90,20 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+             //#region 鍙傛暟
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -97,192 +114,52 @@
             , laydate = layui.laydate
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                ,toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: 'HBillType', title: 'HBillType', hide: true }
-                    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
-                    , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
-                    , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
-                    , { field: 'HMaterID', title: 'HMaterID', hide: true }
-                    , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
-                    , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: 'HProcID', title: 'HProcID', hide: true }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                    , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�' }
-                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                    , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>"  }
-                    , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: 'HSourceID', title: 'HSourceID', hide: true }
-                    , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
-                    , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
-                    , { field: 'HGroupID', title: 'HGroupID', hide: true }
-                    , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
-                    , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
-                    , { field: 'HDeptID', title: 'HDeptID', hide: true }
-                    , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜' }
-                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                    , { field: 'HEmpID', title: 'HEmpID', hide: true }
-                    , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜' }
-                    , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳' }
-                    , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜' }
-                    , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷' }
-                    , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
-                    , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃' }
-                    , { field: '鎵弿浜�', title: '鎵弿浜�' }
-                    , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { 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, 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, 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>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
+            }
+
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板鍋滃伐鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫鍋滃伐鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESStopWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            var index0 = layer.load(0, { shade: false });
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index0);
-                    } else {
-                        layer.close(index0);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index0);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#WorkCenter").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                var ajaxLoad = layer.load();
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
@@ -292,7 +169,9 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                var index = layer.load(0, { shade: false });
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
                 $.ajax({
                     url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
                     type: "GET",
@@ -301,33 +180,311 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
+            });
+            //#endregion
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+                        , { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
+                        , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
+                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: 'HProcID', title: 'HProcID', hide: true }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        , { field: '浠诲姟鍗曟暟閲�', title: '浠诲姟鍗曟暟閲�' }
+                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                        , { field: '寮�濮嬪仠宸ユ椂闂�', title: '寮�濮嬪仠宸ユ椂闂�', templet: "<div>{{d.寮�濮嬪仠宸ユ椂闂� ==null ?'':layui.util.toDateString(d.寮�濮嬪仠宸ユ椂闂�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁撴潫鍋滃伐鏃堕棿', title: '缁撴潫鍋滃伐鏃堕棿', templet: "<div>{{d.缁撴潫鍋滃伐鏃堕棿 ==null ?'':layui.util.toDateString(d.缁撴潫鍋滃伐鏃堕棿, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: 'HSourceID', title: 'HSourceID', hide: true }
+                        , { field: '鐢熶骇璧勬簮浠g爜', title: '鐢熶骇璧勬簮浠g爜' }
+                        , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
+                        , { field: 'HGroupID', title: 'HGroupID', hide: true }
+                        , { field: '鐢熶骇鐝粍浠g爜', title: '鐢熶骇鐝粍浠g爜' }
+                        , { field: '鐢熶骇鐝粍', title: '鐢熶骇鐝粍' }
+                        , { field: 'HDeptID', title: 'HDeptID', hide: true }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜' }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        , { field: 'HEmpID', title: 'HEmpID', hide: true }
+                        , { field: '鐢宠鍋滃伐浜哄憳浠g爜', title: '鐢宠鍋滃伐浜哄憳浠g爜' }
+                        , { field: '鐢宠鍋滃伐浜哄憳', title: '鐢宠鍋滃伐浜哄憳' }
+                        , { field: '鍋滃伐鍘熷洜', title: '鍋滃伐鍘熷洜' }
+                        , { field: '鍋滃伐姹囨姤绫诲瀷', title: '鍋滃伐姹囨姤绫诲瀷' }
+                        , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '鏈哄櫒鍦板潃', title: '鏈哄櫒鍦板潃' }
+                        , { field: '鎵弿浜�', title: '鎵弿浜�' }
+                        , { field: '鎵弿鏃ユ湡', title: '鎵弿鏃ユ湡', templet: "<div>{{d.鎵弿鏃ユ湡 ==null ?'':layui.util.toDateString(d.鎵弿鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { 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, 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, 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>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display() {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板鍋滃伐鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫鍋滃伐鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇鍋滃伐鍗�/Sc_Add_MESStopWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESStopWorkBill/DeltetMESStopWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh() {
+                $("#btnSearch").click();
+            }
+
+            //瀹℃牳
+            function set_CheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
+
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
-        
+
 
 
     </script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 211819d..9a5bdee 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -87,6 +88,7 @@
                             <div class="layui-btn-group">
 
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -315,20 +317,16 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        var refSav = "";   //鎻愪氦绫诲瀷
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -345,6 +343,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -352,67 +351,78 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HEndWorkTime'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            // #region 椤甸潰鍒濆鍖�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //瀹屽伐鏃ユ湡
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3788' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+
+            // #region 椤甸潰鍔犺浇鎵�鏈夋柟娉� 
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HEndWorkTime'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+
             }
 
-
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2) {
+            function set_AddNew() {
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HEndWorkTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //瀹屽伐鏃ユ湡
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
                 $('#HProcName').attr("disabled", true);
@@ -474,43 +484,100 @@
                     });
             }
 
+            //缂栬緫
+            function set_EditFromGrid() {
+                refSav = "Update";
+                //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
+                $('#HProcName').attr("disabled", true);
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HEndWorkTime').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HICMOBillNo').attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
 
-            //淇濆瓨鎻愪氦
-            form.on('submit(Saver)', function (data) {
-                var sMainStr = JSON.stringify(data.field);
-                if (!AllowLoadData())//鏁版嵁楠岃瘉
-                {
-                    return false;
-                }
                 $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainStr },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
-                            });
-                        }
-                        else {
-                            layer.alert(data.Message, { icon: 5 })
-                        }
+                    url: GetWEBURL() + "Sc_MESEndWorkBill/Sc_MESEndWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
                     },
-                    error: function (err) {
-                        layer.alert(err, { icon: 5 })
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESEndWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HEndWorkTime": data.瀹屽伐鏃堕棿
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鎿嶄綔鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D(琛屽彿)
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
-                })
-            });
+                });
+            }
 
-            //閫�鍑�
-            form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
-
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3788' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
 
             //琛ㄥご淇℃伅浜у搧寮圭獥
             form.on('submit(HMaterList)', function () {
@@ -707,6 +774,91 @@
 
 
 
+
+
+            //淇濆瓨鎻愪氦
+            form.on('submit(Saver)', function (data) {
+                var sMainStr = JSON.stringify(data.field);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Sc_MESEndWorkBill/SaveGetMESEndFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: false,
+                    data: { "msg": sMainSub },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                if (data.Verify == "Y") //鑷姩瀹℃牳
+                                {
+                                    layer.close(index);
+                                    SaveVerify(); //瀹℃牳
+                                }
+                                else {
+                                    layer.close(index);
+                                }
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            });
+
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify() {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESEndWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {
+                Pub_Close(1);
+                window.parent.location.reload();
+            });
+
+            //#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\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
index 9193f41..8f5c8e7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
@@ -40,6 +40,18 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
                                 <!--<div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
@@ -72,23 +84,20 @@
                                             <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="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+                                  
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <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 layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" 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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -101,12 +110,20 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -118,71 +135,201 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
-                    , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
-                    , { 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, 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, 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, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            var index = layer.load(0);
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴瀹屽伐鍗曟煡鐪嬪垪琛�
+                set_ClearBill();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板瀹屽伐鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
+                    case 'btn-Edit': set_ShowBill();
+                        break;
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                var ajaxLoad = layer.load();
+                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
+                if (HDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+                }
+                if (HDate1) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+                }
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    }
+                });
+                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+                sWhere = "";
+            });
+
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
+            });
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鏂规硶
+
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
+                        , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
+                        , { 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, 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, 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, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display() {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板瀹屽伐鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+               var checkStatus = table.checkStatus('mainTable')
                             , data = checkStatus.data;
                         if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
+                            var linterid = data[0].hmainid.toString();
+                            var HBillStatus = data[0].HBillStatus.toString();
+                            if (HBillStatus != "1") {
+                                layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                                return false;
+                            }
                             //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                             layer.open({
                                 type: 2
@@ -192,7 +339,7 @@
                                 , shade: 0.6 //閬僵閫忔槑搴�
                                 , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                                 , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?hID=' + hID
+                                , content: '../鐢熶骇瀹屽伐鍗�/Sc_Add_MESEndWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                                 , resize: false,
                                 end: function () {
                                     //鍒锋柊椤甸潰,
@@ -206,133 +353,129 @@
                         } else {
                             layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                         }
+            }
 
-                        break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESEndWorkBill/DeltetMESEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
-                        break;
-                };
-            });
-
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
                     }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESEndWorkBill/DeltetMESEndWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID ,"UserName": sessionStorage["HUserName"]},
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
 
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh() {
                 $("#btnSearch").click();
-            });
+            }
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                if (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                var index = layer.load(0);
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
-                    type: "GET",
-                    data: { "sWhere": sWhere},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(index);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
+            //瀹℃牳
+            function set_CheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                         }
-                    }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
+            //#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\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
index cf042c3..d0b122e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_Add_MESBeginWorkBillList.html"
@@ -14,6 +14,7 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <style type="text/css">
         .layui-form-label {
@@ -85,8 +86,8 @@
                     <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
                                 <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
 
@@ -323,20 +324,16 @@
         var HSourceEntryID = "";  //婧愬崟瀛愬唴鐮�
         var HSourceBillNo = "";   //婧愬崟鍗曞彿
         var HSourceBillType = "";  //婧愬崟绫诲瀷
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        var refSav = "";   //鎻愪氦绫诲瀷
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var Type = params[params[1]];//鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
 
         var edit = function (data) {
             HBillType = data[0].HBillType;
@@ -353,6 +350,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+             //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -360,123 +358,78 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //鏃ユ湡鏃堕棿閫夋嫨鍣�
-            laydate.render({
-                elem: '#HBeginDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HEndDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HMakeDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HUpDateDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCheckDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HCloseDate'
-                , type: 'datetime'
-            });
-            laydate.render({
-                elem: '#HDeleteDate'
-                , type: 'datetime'
-            });
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
-            $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�宸ユ棩鏈�
-            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
-            $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗�
+                set_AddNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+          
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3787' },
-                    success: function (d) {
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HInterID").val(0);
-                    }
+            //鍒濆鍖栨彃浠�
+            function set_InitFrom() {
+                //鏃ユ湡鏃堕棿閫夋嫨鍣�
+                laydate.render({
+                    elem: '#HBeginDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HEndDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HMakeDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HUpDateDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCheckDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HCloseDate'
+                    , type: 'datetime'
+                });
+                laydate.render({
+                    elem: '#HDeleteDate'
+                    , type: 'datetime'
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
-
-              //鑾峰彇涓嬫媺閫変腑鍊�
-            form.on('select(SourceType)', function (data) {
-                Sctag = data.value;
-                form.render('select');
-                if (Sctag != "2")  //鏃犳簮鍗�
-                {
-                    $("#HMainSourceInterID").val("");
-                    $("#HMainSourceEntryID").val("");
-                    $("#HMainSourceBillNo").val("");
-                    $("#HMainSourceBillType").val("");
-                    $('#HMainSourceBillNo').attr("disabled", false);
-                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
-                    Type = 1;
-                }
-                else {
-                    $('#HMainSourceBillNo').attr("disabled", true);
-                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                    Type = 2;
-                }
-            });
 
             //鏃犳簮鍗曟柊澧�
-            if (Type == 1)
+            function set_AddFNew()
             {
-               
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
-                $('#HMaterCode').attr("disabled", true);
-                $('#HMaterList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HMaterName').attr("disabled", true);
-                $('#HMaterSpec').attr("disabled", true);
-                $('#HBeginDate').attr("disabled", true);
-                $('#HEmpName').attr("disabled", true);
-                $('#HEmpList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HSourceName').attr("disabled", true);
-                $('#HSourceList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HMainSourceBillNo').attr("disabled", true);
-                $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HGroupName').attr("disabled", true);
-                $('#HGroupList').removeClass("layui-btn-disabled").attr("disabled", false);
-                $('#HDeptName').attr("disabled", true);
-                $('#HDeptList').removeClass("layui-btn-disabled").attr("disabled", false);
-                form.render('select');
-                $('#HICMOBillNo').attr("disabled", false);
-                //$('#HICMOBillNo').val("0");
-                $("#HProcID").val("0");            //宸ュ簭ID
-                $("#HMainSourceInterID").val("0"); //婧愬崟涓籌D
-                $("#HMainSourceEntryID").val("0"); //婧愬崟瀛愬唴鐮�
-                $("#HICMOInterID").val("0"); //鐢熶骇璁㈠崟ID
-                $("#HICMOEntryID").val("0"); //鐢熶骇璁㈠崟瀛怚D
 
             }
 
             //鏈夋簮鍗曟柊澧�
-            if (Type == 2)
-            {
+            function set_AddNew() {
+                refSav = "Add";
+                //鍒濆鍩烘湰淇℃伅璧嬪��
+                $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //鍗曟嵁鏃ユ湡
+                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"))  //寮�宸ユ棩鏈�
+                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //鍒跺崟鏃ユ湡
+                $("#HMaker").val(sessionStorage["HUserName"]);     //鍒跺崟浜�
 
                 //鍔犳簮鍗曠被鍨嬪尯鍒�(鍙互鍐欎笉鍚岀殑鏂规硶)
 
@@ -539,20 +492,135 @@
                         }
                     });
             }
-
+           
             //缂栬緫
-            if (Type == 3)
+            function set_EditFromGrid()
             {
+                refSav = "Update";
+                $('#HMaterCode').attr("disabled", true);
+                $('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMaterName').attr("disabled", true);
+                $('#HMaterSpec').attr("disabled", true);
+                $('#HBeginDate').attr("disabled", true);
+                $('#HSourceName').attr("disabled", true);
+                $('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HMainSourceBillNo').attr("disabled", true);
+                $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#HDeptName').attr("disabled", true);
+                $('#HDeptList').addClass("layui-btn-disabled").attr("disabled", true);
+                $('#SourceType').attr("disabled", true);
+                form.render('select');
+                $('#HICMOBillNo').attr("disabled", true);
 
+                $.ajax({
+                    url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HInterID": data.hmainid
+                                , "HBillNo": data.鍗曟嵁鍙�
+                                , "HDate": formatDate(data.鏃ユ湡)
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭鍚嶇О
+                                , "HMaterID": data.HMaterID
+                                , "HMaterCode": data.浜у搧浠g爜
+                                , "HMaterName": data.浜у搧鍚嶇О
+                                , "HMaterSpec": data.瑙勬牸鍨嬪彿
+                                , "HBeginDate": data.寮�宸ユ椂闂�
+                                , "HSourceID": data.HSourceID              //璧勬簮ID
+                                , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
+                                , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
+                                , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
+                                , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
+                                , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D
+                                , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
+                                , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
+                                , "HGroupID": data.HGroupID                //鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
+                                , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
+                                , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
+                                , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
+                                , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
+                                , "HRemark": data.澶囨敞                    //澶囨敞
+                                , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
+                                , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
+                                , "HUpDater": sessionStorage["HUserName"]             //淇敼浜�
+                                , "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//淇敼鏃ユ湡
+                                , "HChecker": data.瀹℃牳浜�             //瀹℃牳浜�
+                                , "HCheckDate": data.瀹℃牳鏃ユ湡   //瀹℃牳鏃ユ湡
+                                , "HCloseMan": data.鍏抽棴浜�                //鍏抽棴浜�
+                                , "HCloseDate": data.鍏抽棴鏃ユ湡             //鍏抽棴鏃ユ湡
+                                , "HDeleteMan": data.浣滃簾浜�               //浣滃簾浜�
+                                , "HDeleteDate": data.浣滃簾鏃ユ湡       //浣滃簾鏃ユ湡
+
+                            });
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
             }
+       
+
+            //鍒ゆ柇鏄惁鏂板
+            if (linterid == null || linterid == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3787' },
+                    success: function (d) {
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+            }
+
+              //鑾峰彇涓嬫媺閫変腑鍊�
+            form.on('select(SourceType)', function (data) {
+                Sctag = data.value;
+                form.render('select');
+                if (Sctag != "2")  //鏃犳簮鍗�
+                {
+                    $("#HMainSourceInterID").val("");
+                    $("#HMainSourceEntryID").val("");
+                    $("#HMainSourceBillNo").val("");
+                    $("#HMainSourceBillType").val("");
+                    $('#HMainSourceBillNo').attr("disabled", false);
+                    $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
+                    OperationType = 1;
+                }
+                else {
+                    $('#HMainSourceBillNo').attr("disabled", true);
+                    $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
+                    OperationType = 2;
+                }
+            });
+
+
           
 
 
             //淇濆瓨鎻愪氦
             form.on('submit(Saver)', function (data) {
-         
+                
                 var sMainStr = JSON.stringify(data.field);
-                console.log(sMainStr);
+                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                 if (!AllowLoadData())//鏁版嵁楠岃瘉
                 {
                     return false;
@@ -560,14 +628,23 @@
                 $.ajax({
                     type: "POST",
                     url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                    async: true,
-                    data: { "msg": sMainStr },
+                    async: false,
+                    data: { "msg": sMainSub },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
-                                layer.close(layer.index);
-                                window.parent.location.reload();
+                            $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+                            layer.confirm(data.Message, {
+                                btn: ['纭']
+                            }, function (index) {
+                                    if (data.Verify == "Y") //鑷姩瀹℃牳
+                                    {
+                                        layer.close(index);
+                                        SaveVerify(); //瀹℃牳
+                                    }
+                                    else {
+                                        layer.close(index);
+                                    }
                             });
                         }
                         else {
@@ -580,10 +657,47 @@
                 })
             });
 
+            //瀹℃牳鎸夐挳鎻愪氦
+            form.on('submit(VerIfySaver)', function (data) {
+                SaveVerify();
+            });
+
+            //瀹℃牳鎻愪氦
+            function SaveVerify()
+            {
+                var InterID = $("#HInterID").val();
+                if (!AllowLoadData())//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+                                //layer.close(layer.index);
+                                //window.parent.location.reload();
+                            });
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 })
+                        }
+                    },
+                    error: function (err) {
+                        layer.alert(err, { icon: 5 })
+                    }
+                })
+            }
+           
+
             //閫�鍑�
             form.on('submit(Exit)', function (data) {
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                Pub_Close(1);
+                window.parent.location.reload();
             });
 
 
@@ -819,69 +933,13 @@
                 layer.msg("杞﹂棿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return Result = false;
             }
-            if (Type == "2") {
+            if (OperationType == "2") {
                 if ($("#HICMOInterID").val() == '' || $("#HICMOInterID").val() == null) {
                     layer.msg("鐢熶骇璁㈠崟涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return Result = false;
                 }
             }
             return Result;
-        }
-
-        function RoadBillMain(hID)//鍔犺浇琛ㄥご
-        {
-            //alert(hID);
-            //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-            $.ajax({
-                url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
-                type: "GET",
-                data: {
-                    "HID": hID
-                },
-                success: function (result) {
-
-                    if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                        var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
-                        form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                            "HInterID": data.hmainid
-                            ,"HBillNo": data.鍗曟嵁鍙�
-                            , "HDate": formatDate(data.鏃ユ湡)
-                            , "HProcID": data.HProcID
-                            , "HProcName": data.宸ュ簭鍚嶇О
-                            , "HMaterID": data.HMaterID
-                            , "HMaterCode": data.浜у搧浠g爜
-                            , "HMaterName": data.浜у搧鍚嶇О
-                            , "HMaterSpec": data.瑙勬牸鍨嬪彿
-                            , "HBeginDate": data.寮�宸ユ椂闂�
-                            , "HSourceID": data.HSourceID              //璧勬簮ID
-                            , "HSourceName": data.璧勬簮鍚嶇О             //璧勬簮鍚嶇О
-                            , "HEmpID": data.HEmpID                   //鎿嶄綔鍛業D
-                            , "HEmpName": data.鐢宠寮�宸ヤ汉鍛�           //鎿嶄綔鍛�
-                            , "HMainSourceInterID": data.HMainSourceInterID                 //婧愬崟ID
-                            , "HMainSourceEntryID": data.HMainSourceEntryID                 //婧愬崟瀛怚D
-                            , "HMainSourceBillNo": data.HMainSourceBillNo                 //婧愬崟鍗曞彿
-                            , "HMainSourceBillType": data.HMainSourceBillType               //婧愬崟绫诲瀷
-                            , "HGroupID": data.HGroupID                //鐝粍ID
-                            , "HGroupName": data.鐝粍鍚嶇О              //鐝粍鍚嶇О
-                            , "HDeptID": data.HDeptID                  //閮ㄩ棬ID
-                            , "HDeptName": data.閮ㄩ棬鍚嶇О               //閮ㄩ棬鍚嶇О
-                            , "HICMOInterID": data.HICMOInterID                       //鐢熶骇璁㈠崟涓籌D
-                            , "HICMOEntryID": data.HICMOEntryID                        //鐢熶骇璁㈠崟瀛怚D
-                            , "HICMOBillNo": data.HICMOBillNo                        //鐢熶骇璁㈠崟
-                            , "HRemark": data.澶囨敞                    //澶囨敞
-                            , "HMaker": data.鍒跺崟浜�                            //鍒跺崟浜�
-                            , "HMakeDate": data.鍒跺崟鏃ユ湡                          //鍒跺崟鏃ユ湡
-                            , "HUpDater": data.淇敼浜�                           //淇敼浜�
-                            , "HUpDateDate": data.淇敼鏃ユ湡                        //淇敼鏃ユ湡
-                        });
-
-                    } else {
-                        layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                    }
-                }, error: function () {
-                    layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                }
-            });
         }
 
         function formatDate(date) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
index 5293144..9d04670 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
@@ -40,6 +40,18 @@
                                         <input type="date" class="layui-input" id="HDate1">
                                     </div>
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HSource" id="HSource">
+                                    </div>
+                                </div>
                                 <!--<div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
                                     <div class="layui-input-block">
@@ -72,23 +84,20 @@
                                             <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="HBillNo" id="HBillNo">
-                                        </div>
-                                    </div>
+
                                 </div>
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <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 layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -101,12 +110,20 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
     <script>
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        }
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍙傛暟
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -118,168 +135,52 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
-                    , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
-                    , { 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, 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, 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, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
+            }
 
-            var index = layer.load(0);
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板寮�宸ュ崟',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=&Type=1',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    case 'btn-Add': //set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫寮�宸ュ崟'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?hID=' + hID +'&Type=3'
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': set_Refresh();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //閫�鍑�
+                    case 'get_Exit': Pub_Close(2);
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+                var ajaxLoad = layer.load();
                 var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
                 var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+                var HSource = $("#HSource").val();//鐢熶骇璧勬簮
                 if (HDate) {
                     sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
                 }
@@ -289,24 +190,24 @@
                 if (HBillNo) {
                     sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
                 }
-                var index = layer.load(0);
+                if (HSource) {
+                    sWhere += " and 璧勬簮浠g爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+                }
                 $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                     }
                 });
@@ -320,19 +221,277 @@
                 //$("#BeginHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
             });
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                $("#HBillNo").val("");//鍗曟嵁鍙�
+                $("#HSource").val("");//鐢熶骇璧勬簮
+                $("#btnSearch").click();
             });
+            //#endregion
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display();
+
+            }
+
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+                 option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+                        , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', width: 115 }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 200 }
+                        , { field: '璧勬簮浠g爜', title: '璧勬簮浠g爜', width: 115 }
+                        , { 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, 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, 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, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display()
+            {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew()
+            {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板寮�宸ュ崟',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1")
+                    {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+                        return false;
+                    }
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫寮�宸ュ崟'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇寮�宸ュ崟/Sc_Add_MESBeginWorkBillList.html?OperationType=3&linterid=' + linterid+'&HSouceBillType='
+                        ,resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                    if (HBillStatus != "1") {
+                        layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+                        return false;
+                    }
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetMESBeginWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            //鍒锋柊
+            function set_Refresh()
+            {
+                $("#btnSearch").click();
+            }
+
+            //瀹℃牳
+            function set_CheckBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+                }
+            }
+
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫瀹℃牳鏂规硶
+                    $.ajax({
+                        type: "GET",
+                        url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    // 寰楀埌frame绱㈠紩
+                                    var index = layer.getFrameIndex(window.name);
+                                    //鍏抽棴褰撳墠frame
+                                    layer.close(index);
+                                    //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                    $("#btnSearch").trigger('click');
+                                });
+
+                            } else {
+                                layer.alert(result.code + result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+                }
+
+            }
+
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
index 2913517..b257485 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_Add_EqpMaintenanceBillList.html"
@@ -178,10 +178,8 @@
                         <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
                             </div>
                         </script>
                         <script type="text/html" id="xuhao">
@@ -223,6 +221,7 @@
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+             //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -230,18 +229,63 @@
                 , form = layui.form
                 , laydate = layui.laydate
                 , element = layui.element;
+            //#endregion
 
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate'
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鍗曟彃浠�
+            set_InitFrom();
 
-            });
-            laydate.render({
-                elem: '#HRepairBeginDate'
-            });
-            laydate.render({
-                elem: '#HRepairEndDate'
-            });
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HRepairBeginDate'
+                });
+                laydate.render({
+                    elem: '#HRepairEndDate'
+                });
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HManagerID1', title: 'HManagerID1', edit: 'text', hide: true }
+                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode" }
+                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+                    , { field: 'HRepairID1', title: 'HRepairID1', edit: 'text', event: "", hide: true }
+                    , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠g爜', edit: 'text', event: "", event: "HRepairCode" }
+                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: true
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+            }
+
+           
+             //#endregion
+           
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             //if (sessionStorage.login != "login") {
             //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
@@ -249,27 +293,7 @@
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
             var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                    { type: 'checkbox', fixed: 'left' }
-                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    , { field: 'HManagerID1', title: 'HManagerID1', edit: 'text', hide: true }
-                    , { field: 'HManagerCode', title: '璐熻矗浜轰唬鐮�', edit: 'text', event: "HManagerCode"}
-                    , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
-                    , { field: 'HRepairID1', title: 'HRepairID1', edit: 'text', event: "", hide: true}
-                    , { field: 'HRepairCode', title: '缁翠慨椤圭洰浠g爜', edit: 'text', event: "", event: "HRepairCode" }
-                    , { field: 'HRepairName', title: '缁翠慨椤圭洰', edit: 'text', event: "" }
-                    , { field: 'HRepairExplanation', title: '缁翠慨瑕佹眰', edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
-                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
-                ]]
-                , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
+
             //鍒ゆ柇鏄惁鏂板
             if (hID == null || hID == 0) {
                 //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
@@ -301,6 +325,7 @@
 
             }
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             var rowid = 0;
@@ -311,34 +336,16 @@
                 var AddRow = table.cache['mainTable'];
                 var NewRow = { "HManagerID1": 0, "HManagerCode": "", "HManagerName": "  ", "HRepairID1": 0, "HRepairCode": "", "HRepairName": "  ", "HRepairExplanation": "   ", "HRemark": "  " };
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                        table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //澧炲姞涓�琛�
+                    case 'btn-AddLine': set_AddLine(NewRow, rows);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length > 1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': set_CopyLine(data);
                         break;
                 }
             });
-            //琛屽唴浜嬩欢
+
+            //琛屽唴鍒犻櫎浜嬩欢
             table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 var rowIndex = $(obj.tr).attr("data-index");
@@ -451,10 +458,69 @@
 
             });
 
+            //澧炲姞涓�琛�
+            function set_AddLine(NewRow, rows) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
+                rows++;
+                layer.msg('澧炲姞涓�琛屾寜閽紒');
+            }
 
+            //澶嶅埗涓�琛�
+            function set_CopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+                }
+                else {
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                    //layer.alert(copyrow);
+                }
+            }
+           //#endregion
 
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
+            
+
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+
+            //鍒ゆ柇鏄惁鏂板
+            if (hID == null || hID == 0) {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": '3910' },
+                    success: function (d) {
+                        //console.log(d.data);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(shijian);
+                        $("#HRepairBeginDate").val(shijian);
+                        $("#HRepairEndDate").val(shijian);
+                        $("#HInterID").val(0);
+                    }
+                });
+            }
+            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+                RoadBillMain(hID);
+                /* RoadBillSub(linterid);*/
+            }
+
+            //鍔犺浇琛ㄥご
+            function RoadBillMain(hID) {
                 alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
@@ -499,36 +565,6 @@
                 });
             }
 
-
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
-
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val("0");
-                $("#HBillNo").val("");
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3910' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HRepairBeginDate").val(shijian);
-                        $("#HRepairEndDate").val(shijian);
-                        $("#HInterID").val(0);
-                    }
-                });
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                /* RoadBillSub(linterid);*/
-            }
 
             //琛ㄥご淇℃伅缁翠慨浜哄脊绐� 
             form.on('submit(HEmpList)', function () {
@@ -727,10 +763,6 @@
                 parent.layer.close(index); //鍐嶆墽琛屽叧闂�
             });
 
-          
-
-
-
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
                 parent.location.href = "../../../views/index.html"
@@ -749,41 +781,46 @@
                 return [year, month, day].join('-');
             }
 
-            form.on('submit(Saver)', function (data) {//淇濆瓨
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {
                 //debugger;
                 data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
                 var sMainStr = JSON.stringify(data.field);
                 var sSubStr = JSON.stringify(table.cache['mainTable']);
                 var sMainSub = sMainStr + ';' + sSubStr;
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                });
-                            }
-                            else {
+                //瀵规暟鎹繘琛岄獙璇�
+                if (AllowLoadData(sSubStr)) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainSub },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                    });
+                                }
+                                else {
+                                    f_alert(data.Message);
+                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
 
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                f_alert("閿欒:" + err);
+                                console.log("Reason" + sMainStr);
                             }
-                            layer.closeAll("loading");
-                        },
-                        error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
-                        }
-                    });
+                        });
+                }
             });
+
+
             function f_alert(sMsg) {
                 layer.alert(sMsg, { icon: 5 });
 
@@ -802,10 +839,13 @@
 
 
         });
+
+        //#region 杩斿洖鍊�
         //瀹氫箟鍏ㄥ眬鍙橀噺
         var HReasonName, ReasonID, EmpName, SQProcName,
             ProcID, ZRProcName, QRName
             ;
+        //杩斿洖涓嶈壇鍘熷洜
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
             HReasonName = obj[0].HName;
@@ -823,6 +863,7 @@
             $("#HProcID").val(obj[0].HItemID);
             $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
         }
+        //杩斿洖閮ㄩ棬
         function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
             $("#HDepName").val(obj[0].HName);
             $("#HDeptID").val(obj[0].HItemID);
@@ -834,50 +875,67 @@
             $("#HUnitID").val(obj[0].HItemID);
             $("#HUnitNumber").val(obj[0].HNumber);
         }
-
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
+        //杩斿洖璐d换浜�
+        function GetHKeeperValue(obj) {  
             EmpName = obj[0].HName;
             // $("#HEmpName").val(obj[0].HName);
             //$("#HItemID").val(obj[0].HItemID);
         }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
+        //杩斿洖鐢宠宸ュ簭
+        //function GetHProcValue(obj) {  
         //    SQProcName = obj[0].宸ュ簭;
         //    ProcID = obj[0].HItemID;
         //    //$("#HSQProcName").val(obj[0].宸ュ簭);
         //    //$("#HProcID").val(obj[0].HItemID);
         //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
+        //杩斿洖璐d换宸ュ簭
+        function GetHZRValue(obj) {   
             ZRProcName = obj[0].宸ュ簭;
             //$("#HZRProcName").val(obj[0].宸ュ簭);
             //$("#HItemID").val(obj[0].HItemID);
         }
         //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
+        //杩斿洖涓嶈壇纭浜�
+        function GetHWorkerValue(obj) {  
             QRName = obj[0].HName;
             //$("#HQRName").val(obj[0].HName);
             //$("#HItemID").val(obj[0].HItemID);
         }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
+        //#endregion
+
+        //#region 鏁版嵁楠岃瘉
+        function AllowLoadData(sSubStr) {  //sSubStr
+
             if ($("#HDeptName").val() == '') {
                 layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HEmpName").val() == '') {
+                layer.msg("缁翠慨浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            if ($("#HEquipName").val() == '') {
+                layer.msg("娌℃湁閫夋嫨璁惧", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
+            if ($("#HManagerName").val() == '') {
+                layer.msg("璐熻矗浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if ($("#HRepairName").val() == '') {
+                layer.msg("缁翠慨椤圭洰娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            //鏁板瓧姝e垯(鍖呭惈灏忔暟)
+            var reg = /^\d+(\.\d+)?$/;
+            if (reg.test($("#HPlanTimes").val()) == false || $("#HPlanTimes").val() == '') {
+                layer.msg("璁″垝缁翠慨宸ユ椂璇峰~鍐欐暟瀛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
+            if (reg.test($("#HTimes").val()) == false || $("#HTimes").val() == '') {
+                layer.msg("瀹為檯缁翠慨宸ユ椂璇峰~鍐欐暟瀛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                return false;
+            }
             if ($("#HBillNo").val() == '') {
                 layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
@@ -886,33 +944,51 @@
                 layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //鍒ゆ柇鐗╂枡鏄庣粏椤�
+            if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
             }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
+            if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+                sSubStr = JSON.parse(sSubStr);
+                for (var i = 0; i < sSubStr.length; i++) {
+                    if (sSubStr[i].HManagerCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璐熻矗浜轰唬鐮佷俊鎭负绌�!",  { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    if (sSubStr[i].HRepairCode == "") {
+                        layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,缁翠慨椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        return false;
+                    }
+                    else {
+                        return true;
                     }
                 }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
             }
+            //if (!typeof (sSubStr) == "undefined") {
+            //    //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+            //    //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+            //    //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+            //    //        {
+            //    //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+            //    //            return false;
+            //    //        }
+            //    //    }
+            //    //}
+            //    for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+            //        if (parseFloat(sSubStr[i].HQty) > 0) {
+            //            s = 1;
+            //        }
+            //    }
+            //    if (s == 0) {
+            //        layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //        return false;
+            //    }
+            //}
             else {
                 return true;
             }
+             //#endregion
         }</script>
 </body>
 </html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
index 02db963..a5019f6 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EqpMaintenanceBillList.html"
@@ -66,6 +66,7 @@
                                     <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">
@@ -107,6 +108,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            // #region 鍏ㄥ眬鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -118,248 +120,297 @@
                 , util = layui.util
             //鏌ヨ鏉′欢
             var sWhere = "";
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'hmainid', title: '鍗曟嵁ID', hide: true }
-                    , { 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: 'HEquipID', title: 'HEquipID', width: 200, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
-                    , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
-                    , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸', width: 200 }
-                    , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿', width: 200 }
-                    , { field: 'HRepairID', title: 'HRepairID', width: 200, hide: true }
-                    , { field: '缁翠慨椤圭洰浠g爜', title: '缁翠慨椤圭洰浠g爜', width: 200 }
-                    , { field: '缁翠慨椤圭洰', title: '缁翠慨椤圭洰', width: 160 }
-                    , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
-                    , { field: '缁翠慨浜轰唬鐮�', title: '缁翠慨浜轰唬鐮�', width: 200 }
-                    , { field: '缁翠慨浜�', title: '缁翠慨浜�', width: 200 }
-                    , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
-                    , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
-                    , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 115 }
-                    , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
-                    , { field: '缁翠慨寮�濮嬫棩鏈�', title: '缁翠慨寮�濮嬫棩鏈�', width: 160, templet: "<div>{{d.缁翠慨寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.缁翠慨寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>"}
-                    , { field: '缁翠慨缁撴潫鏃ユ湡', title: '缁翠慨缁撴潫鏃ユ湡', width: 160, 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: '缁翠慨瑕佹眰', title: '缁翠慨瑕佹眰', width: 200 }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
-                    , { 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, 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, 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: 'hsubid', title: 'hsubid', width: 200, hide: true }
-                    , { field: 'HRepairID1', title: 'HRepairID1', width: 115, hide: true }
-                    , { field: '琛ㄤ綋缁翠慨椤圭洰浠g爜', title: '琛ㄤ綋缁翠慨椤圭洰浠g爜', width: 200 }
-                    , { field: '琛ㄤ綋缁翠慨椤圭洰', title: '琛ㄤ綋缁翠慨椤圭洰', width: 200 }
-                    , { field: '琛ㄤ綋缁翠慨瑕佹眰', title: '琛ㄤ綋缁翠慨瑕佹眰', width: 200 }
-                    , { field: 'HManagerID1', title: 'HManagerID1', width: 115, hide: true }
-                    , { field: '琛ㄤ綋璐熻矗浜轰唬鐮�', title: '琛ㄤ綋璐熻矗浜轰唬鐮�', width: 200 }
-                    , { field: '琛ㄤ綋璐熻矗浜�', title: '琛ㄤ綋璐熻矗浜�', width: 200 }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
-                    , { 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: 'HBillType', title: 'HBillType', width: 200, hide: true }
-                ]]
-            };
-
-            var index = layer.load(0);
+             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧缁翠慨鍗�',
-                            closeBtn: 1,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                    //鏂板
+                    case 'btn-Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧缁翠慨鍗�'
-                                , closeBtn: 1
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                    //缂栬緫
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": InterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎
+                    case 'btn-Delete': set_DeleteBill();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
+
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+                        , { 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: 'HEquipID', title: 'HEquipID', width: 200, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', width: 200 }
+                        , { field: '璁惧鍚嶇О', title: '璁惧鍚嶇О', width: 200 }
+                        , { field: '璁惧瑙勬牸', title: '璁惧瑙勬牸', width: 200 }
+                        , { field: '璁惧鍨嬪彿', title: '璁惧鍨嬪彿', width: 200 }
+                        , { field: 'HRepairID', title: 'HRepairID', width: 200, hide: true }
+                        , { field: '缁翠慨椤圭洰浠g爜', title: '缁翠慨椤圭洰浠g爜', width: 200 }
+                        , { field: '缁翠慨椤圭洰', title: '缁翠慨椤圭洰', width: 160 }
+                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+                        , { field: '缁翠慨浜轰唬鐮�', title: '缁翠慨浜轰唬鐮�', width: 200 }
+                        , { field: '缁翠慨浜�', title: '缁翠慨浜�', width: 200 }
+                        , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 115 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
+                        , { field: 'HManagerID', title: 'HManagerID', width: 115, hide: true }
+                        , { field: '璐熻矗浜轰唬鐮�', title: '璐熻矗浜轰唬鐮�', width: 115 }
+                        , { field: '璐熻矗浜�', title: '璐熻矗浜�', width: 200 }
+                        , { field: '缁翠慨寮�濮嬫棩鏈�', title: '缁翠慨寮�濮嬫棩鏈�', width: 160, templet: "<div>{{d.缁翠慨寮�濮嬫棩鏈� ==null ?'':layui.util.toDateString(d.缁翠慨寮�濮嬫棩鏈�, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+                        , { field: '缁翠慨缁撴潫鏃ユ湡', title: '缁翠慨缁撴潫鏃ユ湡', width: 160, 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: '缁翠慨瑕佹眰', title: '缁翠慨瑕佹眰', width: 200 }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 115 }
+                        , { 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, 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, 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: 'hsubid', title: 'hsubid', width: 200, hide: true }
+                        , { field: 'HRepairID1', title: 'HRepairID1', width: 115, hide: true }
+                        , { field: '琛ㄤ綋缁翠慨椤圭洰浠g爜', title: '琛ㄤ綋缁翠慨椤圭洰浠g爜', width: 200 }
+                        , { field: '琛ㄤ綋缁翠慨椤圭洰', title: '琛ㄤ綋缁翠慨椤圭洰', width: 200 }
+                        , { field: '琛ㄤ綋缁翠慨瑕佹眰', title: '琛ㄤ綋缁翠慨瑕佹眰', width: 200 }
+                        , { field: 'HManagerID1', title: 'HManagerID1', width: 115, hide: true }
+                        , { field: '琛ㄤ綋璐熻矗浜轰唬鐮�', title: '琛ㄤ綋璐熻矗浜轰唬鐮�', width: 200 }
+                        , { field: '琛ㄤ綋璐熻矗浜�', title: '琛ㄤ綋璐熻矗浜�', width: 200 }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+                        , { 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: 'HBillType', title: 'HBillType', width: 200, hide: true }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load(0);
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+
+            //鏂板
+            function set_AddNew()
+            {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧缁翠慨鍗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill()
+            {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧缁翠慨鍗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_Add_EqpMaintenanceBillList.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairWorkBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+        }
+
+        //蹇�熻繃婊�
+        function get_FastQuery() {
+            var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+            var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+            var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+            if (HDate) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+            }
+            if (HDate1) {
+                sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+            }
+            if (HBillNo) {
+                sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+            }
+            var index = layer.load(0);
             $.ajax({
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
                 type: "GET",
-                data: { "sWhere": sWhere},
+                data: { "sWhere": sWhere },
                 success: function (data1) {
                     if (data1.count == 1) {
                         option.data = data1.data;
                         table.render(option);
                         layer.close(index);
+                        layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                     } else {
                         layer.close(index);
                         layer.alert(data1.code + data1.Message, { icon: 5 });
                     }
                 }, error: function () {
                     layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
                 }
             });
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HBillNo").val("");//鍗曟嵁鍙�
-                $("#btnSearch").click();
-            });
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
-                var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                if (HDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
-                }
-                if (HDate1) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
-                }
-                if (HBillNo) {
-                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
-                }
-                var index = layer.load(0);
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Sb_EqpRepairWorkBill/GetEqpRepairWorkBillList',
-                    type: "GET",
-                    data: { "sWhere": sWhere},
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.close(index);
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                    }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
+            //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            sWhere = "";
                 //$("#HBillType").val("");//鍗曟嵁绫诲瀷
                 //$("#HBillNo").val("");//鍗曟嵁鍙�
                 //$("#HSourceBillNo").val("");//婧愬崟鍙�
                 //$("#HCreateBy").val("");//鍒跺崟浜�
                 //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
                 //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+        }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+        //閲嶇疆杩囨护鏉′欢鏂规硶
+        function set_ClearQuery() {
+            $("#HDate").val("");//寮�濮嬫棩鏈�
+            $("#HDate1").val("");//缁撴潫鏃ユ湡
+            $("#HBillNo").val("");//鍗曟嵁鍙�
+            $("#btnSearch").click();
+        }
 
+        //鐩戝惉琛屽弻鍑讳簨浠�
+        table.on('rowDouble(mainTable)', function (obj) {
+            layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+        });
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
index 72c7984..7d3a809 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧鐐规璁″垝鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧鐐规璁″垝鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,256 +115,238 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
-                    , { 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧鐐规璁″垝鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧鐐规璁″垝鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
-
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '鐐规椤圭洰', title: '鐐规椤圭洰', width: 115, hide: true }
+                        , { 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                };
+            }
+            var index = layer.load(0);
+
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧鐐规璁″垝鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧鐐规璁″垝鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipDotCheckPlanBillEdit.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
+                })
+            }
         });
-
-
-
-
     </script>
-
 </body>
 </html>
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index 52c8b68..9ab5f9e 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧淇濆吇璁板綍鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧淇濆吇璁板綍鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,246 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
-                    , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
-                    , { 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧淇濆吇璁板綍鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧淇濆吇璁板綍鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', width: 115, hide: true }
+                        , { field: '閰嶄欢鍚嶇О', title: '閰嶄欢鍚嶇О', width: 200 }
+                        , { 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧淇濆吇璁板綍鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+                    }
+                });
+            }
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧淇濆吇璁板綍鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipMaintainBill/DeltetEquipMaintainBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            //瀹℃牳
+            function set_CheckBill() {
+            }
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
+
+            //鍔犺浇缃戞牸
+            function get_Display(sWhere) {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
-                });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
-
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
+                })
+            }
         });
 
 
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
index 591bd0d..7721132 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillList.html"
@@ -1,8 +1,8 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>璁惧淇濆吇璁″垝鍗曞垪琛�</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>璁惧淇濆吇璁″垝鍗曞垪琛�</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -115,251 +115,249 @@
                 , laypage = layui.laypage
                 , laydate = layui.laydate
                 , util = layui.util
-            //鏌ヨ鏉′欢
             var sWhere = "";
+            //鍏敤鍙橀噺
+            var option = [];
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    , { field: 'hmainid', title: 'hmainid', hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
-                    , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
-                    , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', 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, hide: true }
-                    , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
-                    , { 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 }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
-                    , { field: 'hbilltype', title: 'hbilltype', width: 200 }
-                ]]
-            };
-
-            var index = layer.load(0);
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
+                    //鏂板鎸夐挳
                     case 'btn-Add':
-                        //椤甸潰灞�-鑷畾涔�
-                        layer.open({
-                            type: 2,
-                            skin: 'layui-layer-rim', //鍔犱笂杈规
-                            title: '鏂板璁惧淇濆吇璁″垝鍗� ',
-                            closeBtn: false,
-                            shift: 2,
-                            area: ['100%', '100%'],
-                            maxmin: true,
-                            content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html',
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            },
-                            success: function (layero, index) {
-
-                            }
-                        });
+                        set_AddNew();
                         break;
                     case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫璁惧淇濆吇璁″垝鍗� '
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?hID=' + hID
-                                , resize: false,
-                                end: function () {
-                                    //鍒锋柊椤甸潰,
-                                    location.reload();
-                                }
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-
+                        set_ShowBill();
                         break;
                     case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var HInterID = data[0].hmainid.toString();
-
-                            //閫昏緫鍒犻櫎鏂规硶
-                            layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
-                                $.ajax({
-                                    type: "GET",
-                                    url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                                    data: { "HInterID": HInterID },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }, error: function () {
-                                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                    }
-                                });
-                            })
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                        set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit':
+                        set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit':
+                        set_AbandonCheck();
+                        break;
+                    //棰勮鎸夐挳
+                    case 'btn-Print':
+                        get_PrintReport();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn-Close':
+                        parent.layui.admin.events.closeThisTabs();
                         break;
                 };
             });
 
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
-                type: "GET",
-                data: { "sWhere": sWhere},
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            });
-
             //閲嶇疆鎸夐挳
-            //form.on('submit(btnReSearch)', function (data) {
-            //    $("#HBillType").val("");//鍗曟嵁绫诲瀷
-            //    $("#HBillNo").val("");//鍗曟嵁鍙�
-            //    $("#HSourceBillNo").val("");//婧愬崟鍙�
-            //    $("#HCreateBy").val("");//鍒跺崟浜�
-            //    $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-            //    $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            //    $("#btnSearch").click();
-            //});
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //閲嶇疆杩囨护鏉′欢
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+            }
 
             //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-                //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
-                //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
-                //if (HBillNo) {
-                //    sWhere += " and HBillNo like '%" + HBillNo + "%'";
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery(table, option);
+            });
+
+            //蹇�熻繃婊�
+            function get_FastQuery(table, option) {
+                //var HNumber = $("#HNumber").val();
+                //var HName = $("#HName").val();
+                //if (HNumber) {
+                //    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
                 //}
-                //if (HCreateBy) {
-                //    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
-                //}
-                //if (BenginHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
-                //}
-                //if (EndHCreateDate) {
-                //    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
+                //if (HName) {
+                //    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
                 //}
                 var index = layer.load(0);
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160, hide: true }
+                        , { field: '璁惧浠g爜', title: '璁惧浠g爜', 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 }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', width: 200 }
+                        , { field: '閰嶄欢浠g爜', title: '閰嶄欢浠g爜', 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, hide: true }
+                        , { field: '淇敼浜�', title: '淇敼浜�', width: 200, hide: true }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 115, hide: true }
+                        , { 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 }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+                        , { field: 'hbilltype', title: 'hbilltype', width: 200 }
+                    ]]
+                }
+            }
+            var index = layer.load(0);
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板璁惧淇濆吇璁″垝鍗� ',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            //缂栬緫鍗曟嵁
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var hID = data[0].hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫璁惧淇濆吇璁″垝鍗� '
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainPlanBillEdit.html?hID=' + hID
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HInterID = data[0].hmainid.toString();
+
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "/Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": HInterID },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+
+            function get_Display(sWhere) {
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillList',
                     type: "GET",
-                    data: { "sWhere": sWhere},
+                    data: { "sWhere": sWhere },
                     success: function (data1) {
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
                             layer.close(index);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.close(index);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
                         layer.close(index);
-                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-                //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-                sWhere = "";
-                //$("#HBillType").val("");//鍗曟嵁绫诲瀷
-                //$("#HBillNo").val("");//鍗曟嵁鍙�
-                //$("#HSourceBillNo").val("");//婧愬崟鍙�
-                //$("#HCreateBy").val("");//鍒跺崟浜�
-                //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
-                //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
-            });
+            }
 
-            //鐩戝惉琛屽弻鍑讳簨浠�
-            table.on('rowDouble(mainTable)', function (obj) {
-                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
-            });
+            //瀹℃牳
+            function set_CheckBill() {
+            }
 
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+            }
+            
         });
 
 
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
index 3655112..3f1dcfb 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_Add_CheckProject.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <style type="text/css">
+        .layui-form-label {
+            width: 85px;
+        }
+    </style>
 </head>
 <body>
 
@@ -15,128 +20,116 @@
         <div class="layui-row layui-col-space15">
             <div class="layui-col-md12">
                 <div class="layui-card">
-                    <form id="form0" class="layui-form"  lay-filter="component-form-group" action="">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                         <div class="layui-card-header">
                             <div class="layui-btn-group">
-
                                 <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
-
-
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
                             </div>
-
                         </div>
                         <div class="layui-card-body">
                             <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <!--<ul class="layui-tab-title">
-                                <li class="layui-this">鍩烘湰淇℃伅</li>-->
-                                <!--<li>鍏朵粬淇℃伅</li>-->
-                                <!--</ul>-->
                                 <h1 style="text-align:center;"><b>妫�楠屾柟妗堝崟</b></h1>
                                 <div class="layui-tab-content">
                                     <div class="layui-tab-item layui-show">
-
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
-                                                        <input id="HInterID" name="HInterID" value="0" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鍗曟嵁鏃ユ湡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HDate" id="HDate" readonly="readonly" autocomplete="off" disabled>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鏂规鍚嶇О锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HName" id="HName" autocomplete="off" >
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鐗╂枡锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HMater" id="HMater" lay-verify="HMater" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HMateria-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HMaterID" name="HMaterID" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">鐗╂枡浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HMaterNumber" id="HMaterNumber" lay-verify="HMaterNumber" readonly="readonly" autocomplete="off" class="layui-input">
-                                                    </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍗曟嵁鍙�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+                                                    <input id="HInterID" name="HInterID" type="hidden" />
                                                 </div>
                                             </div>
-                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
-                                        </div>
-                                        <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label">宸ュ簭锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HProcName" id="HProcName" lay-verify="" autocomplete="off" class="layui-input">
-
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HProcID" name="HProcID" type="hidden" />
-
-                                                    </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏃ユ湡</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                 </div>
-
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 鐗╂枡澶х被锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HMaterTypeID" onkeyup="this.value=this.value.replace(/\D/g,'')" value="0" lay-verify="" id="HMaterTypeID"  autocomplete="off">
-
-                                                    </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鏂规鍚嶇О</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HName" id="HName" class="layui-input">
                                                 </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 閮ㄩ棬锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDepName" id="HDepName" lay-verify="" autocomplete="off" class="layui-input">
-                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 鍗曚綅锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HUName" lay-verify="" id="HUName" readonly="readonly" autocomplete="off">
-                                                        <input id="HUnitID" name="HUnitID" type="hidden" />
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitID-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs2">
-                                                    <label class="layui-form-label"> 鍗曚綅浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HUnitNumber" lay-verify="" id="HUnitNumber" readonly="readonly" autocomplete="off">
-                                                    </div>
-                                                </div>
-
                                             </div>
                                         </div>
-
-
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-
-                                                <div class="layui-colorpicker-xs">
-                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
-                                                    <div class="layui-input-block">
-                                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
-                                                    </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMaterName" id="HMaterName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMaterID" id="HMaterID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMaterNumber" id="HMaterNumber" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">宸ュ簭</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HProcID" id="HProcID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProcList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鐗╂枡澶х被</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HMaterTypeName" id="HMaterTypeName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HMaterTypeID" id="HMaterTypeID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterTypeList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">閮ㄩ棬</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">榛樿鏂规</label>
+                                                <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="" checked="">
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍗曚綅</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">鍗曚綅浠g爜</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HUnitNumber" id="HUnitNumber" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label">澶囨敞</label>
+                                                <div class="layui-input-inline">
+                                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark" style="min-height:0px;"></textarea>
                                                 </div>
                                             </div>
                                         </div>
@@ -144,19 +137,21 @@
                                 </div>
                             </div>
                         </div>
-
-                        <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                          <div class="layui-tab-content">
+                                <div class="layui-tab-item layui-show">
+                                    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+                                </div>
+                          </div>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
                             </div>
-                        </script>
+                        </script>                    
                         <script type="text/html" id="xuhao">
                             {{d.LAY_TABLE_INDEX+1}}
                         </script>
+                     
                     </form>
                 </div>
             </div>
@@ -170,2125 +165,448 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-
-        //鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
         }
-
-       
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-
 
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
                 , form = layui.form
+                , laydate = layui.laydate
                 , element = layui.element;
+            var option;
+            var sBillType = "3320";
+            var TabRow = { "HPrjNo": 0, "HQCCheckItemID": 0, "HQCCheckItemNumber": "", "HQCCheckItemName": "", "HQCStd": "", "HQCStdMax": "", "HQCUnit": "", "HRemark": ""};
+            //#endregion
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            if (sessionStorage.login != "login") {
-                layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-                    icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-                }, function () { window.location.href = "../../user/login.html"; });
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栬〃鏍�
+            set_InitGrid();
+            
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
             }
-            var tableReload = table.reload;
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                , height: 500
-                //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
-                , page: true //寮�鍚垎椤�
-                , cols: [[ //琛ㄥご
-                     {type:'checkbox', fixed: 'left'}
-                    ,{ templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left',event:"qwe" }
-                    , { field: 'HPrjNo', title: '娆″簭鍙�', event: "", edit: 'text'}
-                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text'}
-                    , { field: 'HNumber', title: '妫�楠岄」鐩唬鐮�', edit: 'text' }
-                    , { field: 'HName', title: '妫�楠岄」鐩悕绉�', edit: 'text', event: "" }
-                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�',edit: 'text', event: "" }
-                    , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�' , edit: 'text'}
-                    , { field: 'HQCUnit', title: '妫�楠屽崟浣�', event: "", edit: 'text' }
-                    , { field: 'HRemark', title: '澶囨敞', edit: 'text'}
-                     ,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
-                ]]
-                   , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-            };
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0)
-            {
-                //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
-                option.data = [{ "HPrjNo": " ", "HQCCheckItemID": 0, "HNumber": "  ", "HName": "   ", "HQCStd": 0, "HQCStdMax": "  ", "HQCUnit": "  ", "HRemark": "  " }];
-                table.render(option);
+            else if (OperationType == 3) {//缂栬緫
+
+                set_EditFromGrid();
             }
-            else
-            {
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-                //缂栬緫鍔犺浇鏁版嵁
-                $.ajax({
-                    url: GetWEBURL() + 'MES_QC_CheckProjectDetail_Json',
-                    type: "GET",
-                    data: { "sqlWhere": "and HInterID="+hID },
-                    success: function (result) {
-                        console.log('gouba' + result);
-                        if (result.count == 1) {
-                            option.data = result.data;
-                            table.render(option);
-
-                        } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.close(index0);
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                }); 
-
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
-     
+            //#endregion
 
-               //澶村伐鍏锋爮浜嬩欢
-            var rowid = 0;
-            var rows = 0;
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            // 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
+                var rowid = 0;
                 var checkStatus = table.checkStatus('mainTable')
-                    ,data = checkStatus.data;;
+                    , data = checkStatus.data;;
                 var AddRow = table.cache['mainTable'];
-                var NewRow = { "HPrjNo": " ", "HQCCheckItemID": 0, "HNumber": "  ", "HName": "   ", "HQCStd": 0, "HQCStdMax": "  ", "HQCUnit": "  ", "HRemark": "  "};
+                var NewRow = TabRow;
                 switch (obj.event) {
-                    case 'btn-AddLine':
-                        //table.cache["mainTable"].push(AddRow[rows]);
-                         table.cache["mainTable"].push(NewRow);
-                        option.data = table.cache["mainTable"];
-                        table.render(option);
-                        rows++;
-                        layer.msg('澧炲姞涓�琛屾寜閽紒')
+                    //鏂板涓�琛�
+                    case 'btn-AddLine': btnAddLine(NewRow);
                         break;
-                    case 'btn-CopyLine':
-                        var copydata = JSON.stringify(data);
-                        if (data.length <= 0) {
-                            layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
-                        }
-                        else if (data.length>1) {
-                            layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
-                        }
-                        else {
-                            var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
-                            var copyrow =copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
-                            table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
-                            option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
-                            table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
-                            //layer.alert(copyrow);
-                        }
+                    //澶嶅埗涓�琛�
+                    case 'btn-CopyLine': btnCopyLine(data);
                         break;
                 }
             });
-            //琛屽唴浜嬩欢
+
+            // 琛屽唴浜嬩欢
             table.on('tool(mainTable)', function (obj) {
-                var data = obj.data;
-                var rowIndex = $(obj.tr).attr("data-index");
-                if (obj.event==='del') {
-                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
-                        console.log("绱㈠紩涓�:" + rowIndex);
-                        if (rowIndex ==='0') {
-                            layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
-                        } else {
-                            obj.del();
-                            layer.close(index);
+                set_GridDelete(obj);   //琛屽唴鍒犻櫎
+                set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+            });
+
+
+            //琛ㄥご寮圭獥鐗╂枡淇℃伅
+            form.on('submit(HMaterList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浜у搧妯″叿鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/PartInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+              
+                        $("#HMaterName").val(checkStatus.data[0].HName);
+                        $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+                        $("#HMaterID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご寮圭獥宸ュ簭
+            form.on('submit(HProcList)', function () {//閫夋嫨宸ュ簭
+                layer.open({
+                    type: 2
+                    , area: ['80%', '80%']
+                    , title: '宸ュ簭鍒楄〃'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , resize: false
+                    , cancel: function (index, layero) {
+                        GetHProcValue(obj);
+                    }
+                })
+            });
+
+            //琛ㄥご鐗╂枡澶х被
+            form.on('submit(HMaterTypeList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鐗╂枡鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/Gy_MaterType.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        console.log(checkStatus);
+                        $("#HMaterTypeName").val(checkStatus.data[0].HName);
+                        $("#HMaterTypeID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご閮ㄩ棬淇℃伅
+            form.on('submit(HDeptList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '閮ㄩ棬鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/DeptInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄥご鍗曚綅鍗曚綅
+            form.on('submit(HUnitList)', function () {//閫夋嫨鍗曚綅
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鍗曚綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/UnitInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HUnitName").val(checkStatus.data[0].HName);
+                        $("#HUnitNumber").val(checkStatus.data[0].HNumber);
+                        $("#HUnitID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+            function set_GridCellCheck(obj) {
+                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+                    if (event.key == "F7") {
+                        if (obj.event === 'HQCCheckItemNumber')  //淇濆吇椤圭洰淇℃伅
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            layer.open({
+                                type: 2,
+                                skin: 'layui-layer-rim', //鍔犱笂杈规
+                                title: '妫�楠岄」鐩垪琛�',
+                                closeBtn: 1,
+                                shift: 2,
+                                area: ['90%', '90%'],
+                                maxmin: true,
+                                content: ['../../PublicPage/CheckItemInformation.html', 'yes'],
+                                btn: ['纭畾', '鍙栨秷']
+                                , btn1: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                                    var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                                    if (checkStatus.data.length === 0) {
+                                        return layer.msg('璇烽�夋嫨鏁版嵁');
+                                    }
+
+                                    //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                                    obj.update({
+                                        HQCCheckItemID: checkStatus.data[0].HItemID,
+                                        HQCCheckItemNumber: checkStatus.data[0].HNumber,
+                                        HQCCheckItemName: checkStatus.data[0].HName,
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
+                        obj.event = "";
+                        return false;
+
+                    }
+                })
+            }
+
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                //debugger;
+                var isEndCheck = document.getElementById("HStandard").checked;
+                data.field.HStandard = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+                var sMainStr = JSON.stringify(data.field);
+                var sSubStr = JSON.stringify(table.cache['mainTable']);
+                var sMainSub = sMainStr + ';' + sSubStr;
+                if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+                {
+                    return false;
+                }
+                $.ajax(
+                    {
+                        type: "POST",
+                        url: GetWEBURL() + "/QC_Management/SaveQCCheckProjectList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                        async: true,
+                        data: { "msg": sMainSub },
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+                                });
+                            }
+                            else {
+                                layer.alert(data.Message, { icon: 5 });
+                            }
+                            layer.closeAll("loading");
+                        },
+                        error: function (err) {
+                            layer.alert("閿欒:" + err, { icon: 5 });
                         }
                     });
-                }
-                if (obj.event === 'ReasonNameEvent') {
-                    var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨涓嶈壇鍘熷洜
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '涓嶈壇鍘熷洜鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_BadReasonList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HWasterReasonName: HReasonName
-                                        ,HBadReasonID:ReasonID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HWasterReasonName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'EmpNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                         //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                           //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                          //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                             //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                            //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                              //寮瑰嚭妗嗛�夋嫨璐d换浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HEmpName: EmpName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HEmpName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'SQProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                              //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                                //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                             //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                               //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                            //寮瑰嚭妗嗛�夋嫨鐢宠宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鐢宠宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HSQProcName: SQProcName
-                                        , HProcID: ProcID
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HSQProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'ZRProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                        //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                            //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                               //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                              //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                             //寮瑰嚭妗嗛�夋嫨璐d换宸ュ簭
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '璐d换宸ュ簭鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HZRProcName: ZRProcName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HZRProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'BadQtyEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-                            //$(obj.tr).find(".layui-table-edit").keyup(function () {
-                            //    var $input = $(this), val = $input.val();
-                            //    if (!val) val = "1";
-                            //    $input.val(val.replace(/[^\d]/g, ''));
-                            //});
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'RemarkEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'PSProcNameEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "1":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "2":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "3":
-                              //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "4":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "5":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "6":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "7":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "8":
-                                  //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "9":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "10":
-                             //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "11":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "12":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "13":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "14":
-                                //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "15":
-                                 //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-                         case "16":
-                               //寮瑰嚭妗嗛�夋嫨涓嶈壇纭浜�
-                            layer.open({
-                                type: 2
-                                , area: ['80%', '80%']
-                                , title: '鑱屽憳鍒楄〃'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
-                                , resize: false
-                                , end: function () {
-                                    _obj.update({
-                                        HPSProcName: QRName
-                                    });
-                                }
-                            })
-                            console.log("瀛楁璧嬪��" + data.HPSProcName);
-                            console.log("琛屽彿锛�" + rowIndex);
-                            break;
-
-                    }
-                }
-                else if (obj.event === 'CloseManEvent') {
-                     var _obj = obj;
-                    switch (rowIndex) {
-                        case "0":
-
-                            break;
-                         case "1":
-
-                            break;
-                         case "2":
-
-                            break;
-                         case "3":
-
-                            break;
-                         case "4":
-
-                            break;
-                         case "5":
-
-                            break;
-                         case "6":
-
-                            break;
-                         case "7":
-
-                            break;
-                         case "8":
-
-                            break;
-                         case "9":
-
-                            break;
-                         case "10":
-
-                            break;
-                         case "11":
-
-                            break;
-                         case "12":
-
-                            break;
-                         case "13":
-
-                            break;
-                         case "14":
-
-                            break;
-                         case "15":
-
-                            break;
-                         case "16":
-
-                            break;
-
-                    }
-                }
-
-
-
             });
 
-           
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
 
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
+
+            //#endregion
+
+
+          
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                //琛ㄥご
+                columns = [
+                    { type: 'checkbox', fixed: 'left' }
+                    , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+                    , { field: 'HPrjNo', title: '娆″簭鍙�', edit: 'text' }
+                    , { field: 'HQCCheckItemID', title: '妫�楠岄」鐩甀D', edit: 'text', hide: true }
+                    , { field: 'HQCCheckItemNumber', title: '妫�楠岄」鐩唬鐮�', edit: 'text', event: 'HQCCheckItemNumber'}
+                    , { field: 'HQCCheckItemName', title: '妫�楠岄」鐩悕绉�', edit: 'text' }
+                    , { field: 'HQCStd', title: '妫�楠屾爣鍑�', edit: 'text' }
+                    , { field: 'HQCStdMax', title: '鏈�澶ф楠屾爣鍑�', edit: 'text' }
+                    , { field: 'HQCUnit', title: '妫�楠屽崟浣�', edit: 'text' }
+                    , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+                    , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+                ];
+                option = {
+                    id: 'mainTable'
+                    , elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , page: false
+                    , cellMinWidth: 120
+                    , height: 500
+                    , cols: [columns]
+                    , done: function (res, curr, count) {
+
+                    }
+                };
+
+            }
+
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
+                option.data = [];
+                table.render(option);
+            }
+
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+                set_EditGrid(linterid);  //缂栬緫鑾峰彇琛ㄤ綋
+                option.data = [TabRow];
+                table.render(option);
+            }
+
+            //鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
+            function get_MAXNum() {
+                //鑾峰彇鏈�澶у崟鎹彿 new
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HPlanInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
+
+                    }
+                });
+            }
+
+            //缂栬緫鑾峰彇琛ㄥご
+            function set_EditForm(linterid) {
+             
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
-                    url: GetWEBURL() + "GetQCCheckProjectDetail",
+                    url: GetWEBURL() + "QC_Management/MES_QC_CheckProjectListCheckDetai",
                     type: "GET",
                     data: {
-                        "HID": hID
+                        "HID": linterid
                     },
                     success: function (result) {
+                        console.log(result);
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Gy_Edit_QCCheckProjectList[0];
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            var data = result.data.h_v_Gy_QCCheckProjectList_NEW[0];
+                            $("input[name='HStandard']").prop("checked", data.HStandard);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            form.val("component-form-group", {
                                 "HBillNo": data.鍗曟嵁鍙�
-                                , "HDate": data.鏃ユ湡
+                                , "HInterID": data.hmainid
+                                , "HDate": formatDate(data.鏃ユ湡)
                                 , "HName": data.鏂规鍚嶇О
-                                , "HMater": data.鐗╂枡鍚嶇О
-                                , "HMaterID": data.鐗╂枡ID
+                                , "HMaterName": data.鐗╂枡鍚嶇О
+                                , "HMaterID": data.HMaterID
                                 , "HMaterNumber": data.鐗╂枡浠g爜
                                 , "HProcName": data.宸ュ簭鍚嶇О
-                                , "HProcID": data.宸ュ簭ID
-                                , "HMaterTypeID": data.鐗╂枡澶х被ID
-                                , "HDepName": data.閮ㄩ棬鍚嶇О
-                                , "HDeptID": data.閮ㄩ棬ID
-                                , "HUName": data.鍗曚綅鍚嶇О
-                                , "HUnitID": data.鍗曚綅ID
+                                , "HProcID": data.HProcID
+                                , "HMaterTypeName": data.鐗╂枡澶х被鍚嶇О
+                                , "HMaterTypeID": data.HMaterTypeID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О
+                                , "HDeptID": data.HDeptID
+                                , "HUnitName": data.鍗曚綅鍚嶇О
+                                , "HUnitID": data.HUnitID
                                 , "HUnitNumber": data.鍗曚綅浠g爜
                                 , "HRemark": data.琛ㄥご澶囨敞
+
                             });
 
                         } else {
@@ -2300,312 +618,95 @@
                 });
             }
 
+            // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝f柟寮�
+            function formatDate(date) {
+                var d = new Date(date),
+                    month = '' + (d.getMonth() + 1),
+                    day = '' + d.getDate(),
+                    year = d.getFullYear();
 
-            var date = new Date();
-            var day = date.getDate();
-            var month = date.getMonth() + 1;
-            var year = date.getFullYear();
-            var shijian = year + "-" + month + "-" + day;
+                if (month.length < 2) month = '0' + month;
+                if (day.length < 2) day = '0' + day;
 
-            //鍒ゆ柇鏄惁鏂板
-            if (hID == null || hID == 0) {
-                //鑾峰彇鏈�澶у崟鎹彿 new
-                $("#HInterID").val(0);
-                $("#HBillNo").val("");
+                return [year, month, day].join('-');
+            }
+
+            // 缂栬緫鑾峰彇琛ㄤ綋
+            function set_EditGrid(linterid) {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鍔犺浇鏁版嵁
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    url: GetWEBURL() + 'QC_Management/MES_QC_CheckProjectListProjectDetai',
                     type: "GET",
-                    data: { "HBillType": '3320' },
-                    success: function (d) {
-                        //console.log(d.data);
-                    /* $("#HInterID").val(d.data[0].HInterID);*/
-                       
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(shijian);
-                        $("#HInterID").val(0);
+                    data: { "HInterID": linterid },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+
+                        } else {
+                            layer.alert(result.code + result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index0);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                RoadBillMain(hID);
-                $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
-               /* RoadBillSub(linterid);*/
+
+            //澧炲姞涓�琛�
+            function btnAddLine(NewRow) {
+                table.cache["mainTable"].push(NewRow);
+                option.data = table.cache["mainTable"];
+                table.render(option);
             }
 
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(HMateria-BT)', function () {//浜у搧
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐗╂枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-            //閫夋嫨宸ュ簭
-            form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-
-            //閫夋嫨閮ㄩ棬
-            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-            //閫夋嫨鍗曚綅
-            form.on('submit(HUnitID-BT)', function () {//閫夋嫨鍗曚綅
-                layer.open({
-                    type: 2
-                    , area: ['666px', '666px']
-                    , title: '鍗曚綅鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-         
-            form.on('submit(Exit)', function (data) {//
-                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-            });
-
-            //閫夋嫨璐d换浜�
-            form.on('submit(HEmployeeID-BT)', function () {//閫夋嫨璐d换浜�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鑱屽憳鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐d换宸ュ簭
-            form.on('submit(HZRProcID-BT)', function () {//閫夋嫨璐d换宸ュ簭
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '璐d换宸ュ簭鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html?Type=HZR', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            
-
-            form.on('submit(Cancel)', function () {
-                if (hID == null || hID == 0) {
-                    parent.location.href = "../../../views/index.html"
+            //澶嶅埗涓�琛�
+            function btnCopyLine(data) {
+                var copydata = JSON.stringify(data);
+                if (data.length <= 0) {
+                    layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+                }
+                else if (data.length > 1) {
+                    layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
                 }
                 else {
-                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                }    
-            })
-
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var sMainStr = JSON.stringify(data.field);
-                var sSubStr = JSON.stringify(table.cache['mainTable']);
-                var sMainSub = sMainStr + ';' + sSubStr;
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "SaveQCCheckProjectList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainSub },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
-                            }
-                            else {
-
-                                f_alert(data.Message);
-                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                            }
-                            layer.closeAll("loading");
-                        },
-                        error: function (err) {
-
-                            f_alert("閿欒:" + err);
-                            console.log("Reason" + sMainStr);
-                        }
-                    });
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
+                    var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+                    var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+                    table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+                    option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                    table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+                }
             }
 
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
+            //琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+            function set_GridDelete(obj) {
+                var data = obj.data;
+                if (obj.event === 'del') {
+                    layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+                        var rowIndex = $(obj.tr).attr("data-index");
+                        option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+                        obj.del();
+                        option.data.splice(rowIndex, 1);//鍒犻櫎缂撳瓨鐨勮
+                        table.reload('mainTable', option);
+                        layer.close(index);
+
+                    });
                 }
-            });
+            }
 
-
+            //#region 闈炵┖楠岃瘉
+            function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
+                var Result = true;
+               
+                return Result;
+            }
+            //#endregion
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID,ZRProcName,QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-             HReasonName = obj[0].HName;
-             ReasonID = obj[0].HItemID;
-        }
-        //杩斿洖鐗╂枡
-        function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
-            $("#HMater").val(obj[0].HName);
-            $("#HMaterID").val(obj[0].HItemID);
-            $("#HMaterNumber").val(obj[0].HNumber);
-        }
         //杩斿洖宸ュ簭
         function GetHProcValue(obj) {  //杩斿洖宸ュ簭
             $("#HProcName").val(obj[0].宸ュ簭);
             $("#HProcID").val(obj[0].HItemID);
-            $("#HProcNumber").val(obj[0].宸ュ簭浠g爜);
-        }
-        function GetHDeptNameValue(obj) {  //杩斿洖閮ㄩ棬
-            $("#HDepName").val(obj[0].HName);
-            $("#HDeptID").val(obj[0].HItemID);
-            $("#HDeptNumber").val(obj[0].HNumber);
-        }
-         //杩斿洖鍗曚綅
-        function GetHUnitNameValue(obj) { 
-            $("#HUName").val(obj[0].HName);
-            $("#HUnitID").val(obj[0].HItemID);
-            $("#HUnitNumber").val(obj[0].HNumber);
-        }
-
-        function GetHKeeperValue(obj) {  //杩斿洖璐d换浜�
-            EmpName = obj[0].HName;
-           // $("#HEmpName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //function GetHProcValue(obj) {  //杩斿洖鐢宠宸ュ簭
-        //    SQProcName = obj[0].宸ュ簭;
-        //    ProcID = obj[0].HItemID;
-        //    //$("#HSQProcName").val(obj[0].宸ュ簭);
-        //    //$("#HProcID").val(obj[0].HItemID);
-        //}
-        function GetHZRValue(obj) {   //杩斿洖璐d换宸ュ簭
-            ZRProcName = obj[0].宸ュ簭;
-            //$("#HZRProcName").val(obj[0].宸ュ簭);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        //HWorker
-        function GetHWorkerValue(obj) {  //杩斿洖涓嶈壇纭浜�
-            QRName = obj[0].HName;
-            //$("#HQRName").val(obj[0].HName);
-            //$("#HItemID").val(obj[0].HItemID);
-        }
-        function AllowLoadData(sSubStr) {  //闈炵┖楠岃瘉
-            //if ($("#HSourceBillNo").val() == '') {
-            //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            //if ($("#HWHNAME").val() == '') {
-            //    layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
-            //    return false;
-            //}
-            if ($("#HBillNo").val() == '') {
-                layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HInterID").val() == '') {
-                layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (typeof (sSubStr) == "undefined") {
-                layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if (!typeof (sSubStr) == "undefined") {
-                //for (var i = 0; i <= sSubStr.length - 1; i++) {  //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
-                //    if (parseFloat(sSubStr[i].HQtyMust) > 0) {
-                //        if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
-                //        {
-                //            layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
-                //            return false;
-                //        }
-                //    }
-                //}
-                for (var i = 0; i <= sSubStr.length - 1; i++) {   //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
-                    if (parseFloat(sSubStr[i].HQty) > 0) {
-                        s = 1;
-                    }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return false;
-                }
-            }
-            else {
-                return true;
-            }
         }
     </script>
 </body>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
index 906519e..5ee3d95 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\346\243\200\351\252\214\346\226\271\346\241\210\345\215\225/QC_CheckProjectList.html"
@@ -15,7 +15,7 @@
     <div class="layui-card layadmin-header">
         <div class="layui-breadcrumb" lay-filter="breadcrumb">
             <a lay-href="">涓婚〉</a>
-        
+
         </div>
     </div>
 
@@ -34,7 +34,7 @@
                                         <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                     </div>
                                 </div>
-                              
+
                                 <div class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫棩鏈�</label>
                                     <div class="layui-input-block">
@@ -48,7 +48,7 @@
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
+                                    <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>
                                 </div>
@@ -62,8 +62,11 @@
                     <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
                     <script type="text/html" id="toolbarDemo">
                         <div class="layui-btn-container">
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="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" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+   
+                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Exit" ><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
                         </div>
                     </script>
                 </div>
@@ -76,341 +79,291 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-        var _cur_page = 1;
-        var sql = " ";
-        //var options = document.getElementById('HStatus').children;
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟  //鍗曟嵁缂栬緫鐘舵�侊細 1.鏃犳簮鍗曟柊澧灺� 聽2.鏈夋簮鍗曟柊澧灺� 聽3.缂栬緫聽 4.娴忚聽 5.鍙樻洿
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
         }
-
-        function f_alert(sMsg) {
-            layer.alert(sMsg, { icon: 5 });
-            //layer.open({
-            //    type: 1
-            //  , offset: 'auto' //鍏蜂綋閰嶇疆鍙傝�冿細http://www.layui.com/doc/modules/layer.html#offset
-            //  , id: 'layerDemo' //闃叉閲嶅寮瑰嚭
-            //  , content: '<div style="padding: 20px 100px;">' + sMsg + '</div>'
-            //  , shade: 0 //涓嶆樉绀洪伄缃�
-            //  , yes: function () {
-            //      layer.closeAll();
-            //  }
-            //});
-        }
-        var params = getUrlVars();
-        var type = params[params[0]];
-        //switch (type) {
-        //    case "UnConfirm":
-        //        options[1].selected = true;
-        //        sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
-        //        //$("#HStatus").attr("disabled", true)
-        //        break;
-        //    case "ReConfirm":
-        //        options[2].selected = true;
-        //        sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
-        //        sql += " and 鏈叧鑱旀暟閲� > 0";
-        //        break;
-        //    case "ReBack":
-        //        options[3].selected = true;
-        //        sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
-        //        break;
-        //}
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , laydate = layui.laydate
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element;
-            //甯歌鐢ㄦ硶
-            laydate.render({
-                elem: '#HDate1'
-            });
-            laydate.render({
-                elem: '#HDate2'
-            });
-            //layui.code();
-            RoadHBillNo(sql);
-            layer.load(3)
-            //鏂规硶绾ф覆鏌�
-            table.render({
-                elem: '#mainTable'
-                , dateType: 'json'
-                , colFilterRecord: true//鏄惁寮�鍚瓧娈电瓫閫夌殑璁板繂鍔熻兘
-                , data: []
-                //  , url:  GetWEBURL()+'GetPOOrderBill'
-                , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
-                , defaultToolbar: ['filter', 'exports', 'print']
-                // , where: { msg: "", NowPage: 1, OnePage: 10 }
-              , cellMinWidth: 100
-              , cols: [[
-                  { type: 'checkbox', fixed: 'left' }
-                  , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
-                  , { field: 'hsubid', title: 'hsubid' ,hide: true }
-                  , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
-                  , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
-                  , { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105 }
-                  , { field: '鐗╂枡', title: '鐗╂枡' }
-                  , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
-                  , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
-                  , { field: '鐗╂枡澶х被浠g爜', title: '鐗╂枡澶х被浠g爜' }
-                  , { field: '鐗╂枡澶х被鍚嶇О', title: '鐗╂枡澶х被鍚嶇О', width: 115 }
-                  , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 115 }
-                  , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
-                  , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 160 }
-                  , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160 }
-                  , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 160 }
-                  , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 160 }
-                  , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
-                  , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
-                  , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
-                  , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', hide: true, width: 160 }
-                  , { field: '淇敼浜� ', title: '淇敼浜�', width: 215 }
-                  , { field: '淇敼鏃ユ湡 ', title: '淇敼鏃ユ湡 ', width: 115 }
-                  , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                  , { field: '鍏抽棴鏃ユ湡	', title: '鍏抽棴鏃ユ湡', width: 100 }
-                  , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                  , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                  , { field: '淇敼浜� ', title: '淇敼浜�' }
-                  , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                  , { field: '鍏抽棴浜�	', title: '鍏抽棴浜�' }
-                  , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                  , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                  , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                  , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                , admin = layui.admin
+                , layer = layui.layer
+                , laydate = layui.laydate
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element;
 
-              ]]
-                //, skin: 'row' //琛ㄦ牸椋庢牸
-                // , even: true
-            , page: true //鏄惁鏄剧ず鍒嗛〉
-            , limits: [10, 20, 50, 100]
-            , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
-                //, height: 500
-            , done: function (res, curr, count) {
-                _cur_page = curr;
-                layer.closeAll("loading");
+            var sWhere = "";
+            var option = [];
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                //鎶ュ伐骞冲彴鎶ユ鐢宠鏌ョ湅鍒楄〃
+                set_ClearBill();
             }
-            });
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+           //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
-                var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
-                    case 'btn-getCheckData':
-                        var data = checkStatus.data;
-                        layer.alert(JSON.stringify(data));
+                    //鏂板鎸夐挳
+                    case 'btn-Add': set_AddNew();
                         break;
-                    case 'btn-Edit':
-                        var checkStatus = table.checkStatus('mainTable')
-                       , data = checkStatus.data;
-                        if (checkStatus.data.length === 1) {
-                            var hID = data[0].hmainid.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫妫�楠屾柟妗堝崟'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../妫�楠屾柟妗堝崟/QC_Add_CheckProject.html?hID=' + hID
-                                , resize: false
-                                , cancel: function () {
-                                    //$(".layui-btn").removeClass("layui-btn-disabled");
-                                }
-                            })
-                           
-                        } else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                        }
-                      
+                    //缂栬緫鎸夐挳
+                    case 'btn-Edit': set_ShowBill();
                         break;
-                    case 'btn-Delete':
-                        var checkStatus = table.checkStatus('mainTable')
-                            , data = checkStatus.data;
-                        if (checkStatus.data.length === 1)
-                        {
-                            var InterID = data[0].hmainid.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            $.ajax({
-                                url: GetWEBURL() + 'DeltetQCCheckProject',
-                                type: "GET",
-                                data: { "HInterID": InterID },
-                                success: function (result) {
-                                    console.log('gouba' + result);
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload(); });
-                                        
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
-                                }, error: function () {
-                                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                                }
-                            }); 
-                        }
-                        else {
-                            layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
-                        }
+                    //鍒犻櫎鎸夐挳
+                    case 'btn-Delete': set_DeleteBill();
+                        break;
+                    //瀹℃牳鎸夐挳
+                    case 'btn-Audit': set_CheckBill();
+                        break;
+                    //鍙嶅鏍告寜閽�
+                    case 'btn-DeAudit': set_AbandonCheck();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'btn_Exit': Pub_Close(1);
                         break;
                 };
             });
 
+            //鏌ヨ
+            form.on('submit(btnSearch)', function (data) {//鏌ヨ
+                get_FastQuery();
+            });
+            //#endregion
 
 
-            ///鍔犺浇鏄剧ず鏁版嵁
-            function RoadHBillNo(sqlWhere) {
-                where = sqlWhere;
+
+            //鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栫綉鏍�
+            function set_InitGrid()
+            {
+                $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+                $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+                option = {
+                    elem: '#mainTable'
+                    , dateType: 'json'
+                    , colFilterRecord: true//鏄惁寮�鍚瓧娈电瓫閫夌殑璁板繂鍔熻兘
+                    , toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+                    , defaultToolbar: ['filter', 'exports', 'print']
+                    , cellMinWidth: 100
+                    , height: 'full-50'
+                    , page: true
+                    , limits: [50, 500, 1000, 5000]
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+                        , { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105 }
+                        , { field: '鐗╂枡', title: '鐗╂枡' }
+                        , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜' }
+                        , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+                        , { field: '鐗╂枡澶х被浠g爜', title: '鐗╂枡澶х被浠g爜' }
+                        , { field: '鐗╂枡澶х被鍚嶇О', title: '鐗╂枡澶х被鍚嶇О', width: 115 }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜', width: 115 }
+                        , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜', width: 160 }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 160 }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜', width: 160 }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 160 }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160 }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160 }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 160 }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', hide: true, width: 160 }
+                        , { field: '淇敼浜� ', title: '淇敼浜�', width: 215 }
+                        , { field: '淇敼鏃ユ湡 ', title: '淇敼鏃ユ湡 ', width: 115 }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡	', title: '鍏抽棴鏃ユ湡', width: 100 }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                        , { field: '淇敼浜� ', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                        , { field: '鍏抽棴浜�	', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    type: "get",
-                    url: GetWEBURL() +"/QC_Management/MES_QC_CheckProjectList_Json",
-                    async: true,
-                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+                    url: GetWEBURL() + "/QC_Management/MES_QC_CheckProjectList_Json",
+                    type: "GET",
+                    data: { "sWhere": sWhere },
                     success: function (result) {
                         if (result.count == 1) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('mainTable', {
-                            data: ajaxReturnData
-                            , height: 'full-10'
-                            , page: {
-                                curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
-                            }
-                            , loading: false
-                            , done: function (index, res) {
-
-                            }
-                        });
-                    } else {
-                            layer.alert(result.code + result.Message, { icon: 5 });
-                    }
-
-                    },
-                    error: function (result) {
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            option.data = result.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            };
-            form.on('submit(f_Query)', function (data) {//鏌ヨ
-                var sqlWhere = " and 1=1 ";
-                //if ($("#HStatus").val() != "")
-                //    sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
-                var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
-                var HNumber = $("#HNumber").val();//鐗╂枡浠g爜
-                var HName = $("#HName").val();//鐗╂枡鍚嶇О
-                var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
-                var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
-                var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+            }
 
-                if (HBillNo)
-                    sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
-                if (HNumber)
-                    sqlWhere += " and 鐗╂枡浠g爜 like '%" + HNumber + "%'";
-                if (HName)
-                    sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
-                if (HModel)
-                    sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
-                //if ($("#HClStatus").val() != "")
-                //    sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
-                //if ($("#HPURCHASEORGID").val() != "")
-                //    sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HBillNo = $("#HBillNo").val();
+                var HDate1 = $("#HDate1").val();
+                var HDate2 = $("#HDate2").val();
+                if (HBillNo) {
+                    sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+                }
                 if (HDate1) {
-                    sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate1 + "'";
                 }
                 if (HDate2) {
-                    sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate2 + "'";
                 }
-                //if ($("#HISGenerate").val() != "") {
-                //    if ($("#HISGenerate").val() == "鏄�")
-                //    {
-                //        sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
-                //    }
-                //    else if ($("#HISGenerate").val() == "鍚�") {
-                //        sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
-                //    }
-                //}
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
 
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妫�楠屾柟妗�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../妫�楠屾柟妗堝崟/QC_Add_CheckProject.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
-                var Time = $("#Time").val();
-                var dd = new Date();
-                var dt;
-                switch (Time) {
-                    case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
-                    case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
-                    case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
-                    case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
-                    case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
-                    case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
-                    case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
-                    default: dd = new Date(dd.setDate(dd.getDate()));
+                    }
+                });
+            }
+
+            //缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                  
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫妫�楠屾柟妗�'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../妫�楠屾柟妗堝崟/QC_Add_CheckProject.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-                dt = dd.getFullYear().toString();
-                if (dd.getMonth() + 1 < 10) {
-                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
+            }
+
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var InterID = data[0].hmainid.toString();
+                    var HBillStatus = data[0].HBillStatus.toString();
+                
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "Sc_MESBeginWorkBill/DeltetQCCheckProject", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"] },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        });
+                    })
                 }
                 else {
-                    dt = dt + "-0" + (dd.getMonth() + 1).toString();
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
-                if (dd.getDate() < 10) {
-                    dt = dt + "-0" + dd.getDate().toString();
-                }
-                else {
-                    dt = dt + "-" + dd.getDate().toString();
-                }
-                //if (Time != 8) {
-                //    sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
-                //}
-                sql = sqlWhere;
-                //浠庣涓�椤靛紑濮�
-                _cur_page = 1;
-                RoadHBillNo(sqlWhere);
-            });
-            var $ = layui.$, active = {
-                f_Query: function () { //鏌ヨ
+            }
 
-                },
-                f_Qrjq: function () { //鎺ュ彈
+            //瀹℃牳
+            function set_CheckBill() {
 
-                },
-                f_Bhjq: function () { //鎷掔粷
+            }
 
-                },
-                //JSreload: function () {
-                //    var demoReload = $('#test-table-demoReload');
-                //    //鎵ц閲嶈浇
-                //    table.JSreload('test-table-reload', {
-                //        page: {
-                //            curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
-                //        }
-                //      , where: {
-                //          key: {
-                //              id: demoReload.val()
-                //          }
-                //      }
-                //    });
-                //}
-            };
-            $('.test-table-reload-btn .layui-btn').on('click', function () {
-                var type = $(this).data('type');
-                active[type] ? active[type].call(this) : '';
-            });
+            //鍙嶅鏍�
+            function set_AbandonCheck() {
+
+            }
+
+
+
         });
     </script>
 </body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9028361..e94a68c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -9,6 +9,11 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <style>
         .main-btn { /*澶撮儴涓绘寜閽�*/
             padding: 0 2px; /*璋冩暣鎸夐挳宸﹀彸绌洪殭澶у皬*/
@@ -31,19 +36,11 @@
         <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div style="padding: 10px;">
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-print layuiadmin-button-btn"><span class="btn-title">棰勮</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                            <i class="layui-icon layui-icon-edit layuiadmin-button-btn"><span class="btn-title">淇敼</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">
-                            <i class="layui-icon layui-icon-delete layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <ul class="layui-tab-title" lay-filter="tab-all">
@@ -504,6 +501,7 @@
                             <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
                         </div>
                     </script>
+                    <input id="HItemID" name="HItemID" type="hidden" />
                 </form>
             </div>
         </div>
@@ -513,10 +511,6 @@
         <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
     </script>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
 
         layui.config({
@@ -538,28 +532,25 @@
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
 
-            var params = getUrlVars();
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            var params = get_UrlVars();
+            if (typeof (params[params[0]]) == "undefined") {
+                var OperationType = 1;//鎿嶄綔绫诲瀷
+            } else {
+                var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+                var linterid = params[params[1]];//婧愬崟id
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
             }
-
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-            //鍒ゆ柇鏄惁鏂板
-            if (linterid == null || linterid == 0) {
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 2) {//鏈夋簮鍗曟柊澧�
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
-                    data: { "HBillType": '3772' },
+                    data: { "HBillType": '7505' },
                     success: function (d) {
                         //console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
@@ -568,11 +559,24 @@
                         $("#HMaker").val(sessionStorage["HUserName"]);
                     }
                 });
+                GetICMOBillValue(linterid)
             }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
                 RoadBillMain(linterid);
-                RoadBillSub(linterid);
+                //RoadBillSub(linterid);
             }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
             //鍒濆琛ㄦ牸鏁版嵁
             var rowdata = [{
                 "HProcNo": "0", "hprocid": "0", "HProcNumber": "", "宸ュ簭": "", "鍔犲伐璇存槑": "",
@@ -924,17 +928,23 @@
             //閫夋嫨鐢熶骇浠诲姟鍗�
             form.on('submit(btnSearchICMOBill)', function () {
                 layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢熶骇浠诲姟鍗曞垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        GetICMOBillValue(checkStatus.data[0].hmainid)
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
             });
 
@@ -1010,13 +1020,80 @@
             });
 
             form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
+                Pub_Close(1);
             })
 
-            //鑾峰彇鏄庣粏琛�
-            window.GetICMOBillDetail = function (hmainid) {  //杩斿洖璐d换浜�
+
+            ////鑾峰彇鏄庣粏琛�
+            //window.GetICMOBillDetail = function (hmainid) {
+            //    $.ajax({
+            //        url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
+            //        type: "GET",
+            //        data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+            //        success: function (result) {
+            //            if (result.count == 1) {
+            //                option.data = result.data;
+            //                table.render(option);
+            //            }
+            //            else {
+            //                layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //            }
+            //        }
+            //    })
+            //}
+
+
+            //杩斿洖鐢熶骇浠诲姟鍗�
+            function GetICMOBillValue(hmainid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
+                    type: "GET",
+                    data: { "hmainid": hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            var data = result.data[result.data.length - 1];
+                            $("#HICMOInterID").val(data.hmainid);
+                            $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
+                            $("#HICMOEntryID").val(data.HEntryID);
+                            $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
+                            $("#HMaterID").val(data.hmaterid);
+                            $("#HMaterName").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterID2").val(data.hmaterid);
+                            $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
+                            $("#HMaterNumber").val(data.鐗╂枡浠g爜);
+                            $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
+                            $("#HModel").val(data.瑙勬牸鍨嬪彿);
+                            $("#HBatchNo").val(data.鎵瑰彿);
+                            $("#HUnitID").val(data.hunitid);
+                            $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
+                            $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
+                            $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
+                            $("#HQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
+                            $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
+                            $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
+                            $("#HWorkShopID").val(data.hdeptid);
+                            $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
+                            $("#HProdMaterCode").val(data.浜у搧CODE);
+                            $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
+                            $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
+                            $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
+                            $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
+                            $("#HProdMaterName").val(data.浜у搧鍚嶇О);
+                            $("#HCusName").val(data.瀹㈡埛鍚嶇О);
+                            $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
+                            $("#HImportNote").val(data.閲嶈鎻愮ず);
+                        }
+                        else {
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    }
+                })
+                //txtHBillNo.Text = sBillNo;
+                GetICMOBillDetail(hmainid);
+            }
+
+            function GetICMOBillDetail(hmainid) {
                 $.ajax({
                     url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillList",
                     type: "GET",
@@ -1045,55 +1122,6 @@
             ZRProcName, QRName;
 
 
-        //杩斿洖鐢熶骇浠诲姟鍗�
-        function GetICMOBillValue(obj) {
-            $.ajax({
-                url: GetWEBURL() + "/Sc_ProcessExchangeBill/GetICMOBillDetail",
-                type: "GET",
-                data: { "hmainid": obj[0].hmainid, "OrganizationID": sessionStorage["OrganizationID"] },
-                success: function (result) {
-                    if (result.count == 1) {
-                        var data = result.data[result.data.length-1];
-                        $("#HICMOInterID").val(data.hmainid);
-                        $("#HICMOBillNo").val(data.鐢熶骇璁㈠崟鍙�);
-                        $("#HICMOEntryID").val(data.HEntryID);
-                        $("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
-                        $("#HMaterID").val(data.hmaterid);
-                        $("#HMaterName").val(data.鐗╂枡鍚嶇О);
-                        $("#HMaterID2").val(data.hmaterid);
-                        $("#HMaterName2").val(data.鐗╂枡鍚嶇О);
-                        $("#HMaterNumber").val(data.鐗╂枡浠g爜);
-                        $("#HMaterNumber2").val(data.鐗╂枡浠g爜);
-                        $("#HModel").val(data.瑙勬牸鍨嬪彿);
-                        $("#HBatchNo").val(data.鎵瑰彿);
-                        $("#HUnitID").val(data.hunitid);
-                        $("#HUnitName").val(data.璁¢噺鍗曚綅鍚嶇О);
-                        $("#HUnitNumber").val(data.璁¢噺鍗曚綅浠g爜);
-                        $("#HPlanQty").val(data.璁″垝鐢熶骇鏁伴噺);
-                        $("#HQty").val(data.娴佽浆鍗℃暟閲�);
-                        $("#HprocExQty").val(data.娴佽浆鍗℃暟閲�);
-                        $("#HPlanBeginDate").val(data.璁″垝寮�宸ユ棩鏈�);
-                        $("#HPlanEndDate").val(data.璁″垝瀹屽伐鏃ユ湡);
-                        $("#HWorkShopID").val(data.hdeptid);
-                        $("#HWorkShopName").val(data.鐢熶骇杞﹂棿鍚嶇О);
-                        $("#HProdMaterCode").val(data.浜у搧CODE);
-                        $("#HSeOrderBillNo").val(data.閿�鍞鍗曞彿);
-                        $("#HCusShortName").val(data.瀹㈡埛绠�绉�);
-                        $("#HCusNeedMaterial").val(data.瀹㈡埛瑕佹眰鏉愭枡鎴愬垎);
-                        $("#HPlanSendGoodsDate").val(data.棰勮鍑鸿揣鏃ユ湡);
-                        $("#HProdMaterName").val(data.浜у搧鍚嶇О);
-                        $("#HCusName").val(data.瀹㈡埛鍚嶇О);
-                        $("#HWorkRemark").val(data.鐢熶骇澶囨敞);
-                        $("#HImportNote").val(data.閲嶈鎻愮ず);
-                    }
-                    else {
-                        layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                }
-            })
-            //txtHBillNo.Text = sBillNo;
-            GetICMOBillDetail(obj[0].hmainid);
-        }
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
             HReasonName = obj[0].HName;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index ed42986..be1c312 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -107,6 +107,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -117,165 +118,19 @@
             , laydate = layui.laydate
             //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
             var sWhere = "";
+            var option = "";
+            var option2 = "";
             var wybj = false;
+            //#endregion  
 
-            //涓昏〃鍒楄〃
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,page: true
-                , height: 256
-                , cellMinWidth: 90
-                , cols: [[
-                    //{ field: 'hmainid', title: 'hmainid', width: 90 }
-                    { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
-                    , { field: '绫诲瀷', title: '绫诲瀷' }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort:true }
-                    , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
-                    //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
-                    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
-                    //, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80 }
-                    //, { field: 'HDeptID', title: 'HDeptID', width: 80 }
-                    , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
-                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                    , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
-                    //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
-                    , { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
-                    , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
-                    , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
-                    , { field: '鎵瑰彿', title: '鎵瑰彿' }
-                    , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
-                    //, { field: 'HMaterID2', title: 'HMaterID2', width: 80 }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    //, { field: 'HUnitID', title: 'HUnitID', width: 80 }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
-                    , { field: '鍗曚綅', title: '鍗曚綅' }
-                    , { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
-                    , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
-                    , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
-                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
-                    , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
-                    , { field: '鎽樿', title: '鎽樿' }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
-                    , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
-                    //, { field: 'HBillType', title: 'HBillType', width: 80 }
-                    //, { field: 'hsubid', title: 'hsubid', width: 80 }
-                    , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
-                ]]
-                ,text:"鏃犳暟鎹�!"
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            //浠庤〃鍒楄〃
-            var option2 = {
-                elem: '#mainTable2'
-                //, toolbar: '#toolbarDemo'
-                ,page: true
-                , height: 226
-                , cellMinWidth: 90
-                , cols: [[
-                    //{ field: 'hsubid', title: 'hsubid' }
-                    { field: '娴佹按鍙�', title: '娴佹按鍙�' }
-                    //, { field: 'HProcID', title: 'HProcID' }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                    , { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
-                    , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
-                    , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
-                    , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
-                    , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
-                    //, { field: 'hmainid', title: 'hmainid' }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    //, { field: 'hicmointerid', title: 'hicmointerid' }
-                    , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
-                    //, { field: 'HWorkShopID', title: 'HWorkShopID' }
-                    , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
-                    , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
-                    //, { field: 'HMaterID', title: 'HMaterID' }
-                    , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
-                    , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
-                    , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
-                    , { field: '鎵瑰彿', title: '鎵瑰彿' }
-                    //, { field: 'HUnitID', title: 'HUnitID' }
-                    , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
-                    , { field: '鍗曚綅', title: '鍗曚綅' }
-                    , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
-                    , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
-                    , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
-                    , { field: '鎽樿', title: '鎽樿' }
-                    , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
-                    //, { field: 'HSupID', title: 'HSupID' }
-                    , { field: '濮斿鍔犲伐鍗曚綅浠g爜', title: '濮斿鍔犲伐鍗曚綅浠g爜' }
-                    , { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
-                    , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
-                    //, { field: 'HBillType', title: 'HBillType' }
-                    , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
-                    , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺' }
-                    , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺' }
-                    , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺' }
-                    , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
-                    , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
-                    , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
-                    , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
-                    , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
-                    , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
-                    , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
-                    , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
-                    , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
-                    , { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
-                    , { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
-                    , { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
-                    , { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
-                    , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
-                ]]
-            };
-            table.render(option);
-            table.render(option2);
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                    } else {
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
-                }
-            });
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
-                wybj = false;//濮斿鏍囪
-                $("#HDate").val("");//寮�濮嬫棩鏈�
-                $("#HDate1").val("");//缁撴潫鏃ユ湡
-                $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
-                $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
-                $("#btnSearch").click();
-            });
+            //#endregion
 
-            form.on('checkbox(wybj)', function (data) {
-                wybj = data.elem.checked; //鏄惁琚�変腑锛宼rue鎴栬�協alse
-            });
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
@@ -330,7 +185,23 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
 
-            //鐩戝惉宸ュ叿鏉″垹闄や簨浠�
+            //閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#SHPrintQty").val("");//鎵撳嵃鐘舵��
+                wybj = false;//濮斿鏍囪
+                $("#HDate").val("");//寮�濮嬫棩鏈�
+                $("#HDate1").val("");//缁撴潫鏃ユ湡
+                $("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
+                $("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
+                $("#btnSearch").click();
+            });
+
+            //閫変腑鍒ゆ柇
+            form.on('checkbox(wybj)', function (data) {
+                wybj = data.elem.checked; //鏄惁琚�変腑锛宼rue鎴栬�協alse
+            });
+
+            //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
             table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
                 var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
                 var HMainID = datas.hmainid;
@@ -351,7 +222,174 @@
                 });
             });
 
+            //#endregion
 
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            function set_ClearBill()
+            {
+                //鍒濆鍖栦富琛ㄥ垪琛�
+                set_InitGrid();
+                //鍒濆鍖栦粠琛ㄥ垪琛�
+                set_InitGrid2();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+
+            //鍒濆鍖栦富琛ㄥ垪琛�
+            function set_InitGrid()
+            {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , page: true
+                    , height: 256
+                    , cellMinWidth: 90
+                    , cols: [[
+                        //{ field: 'hmainid', title: 'hmainid', width: 90 }
+                        { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟' }
+                        , { field: '绫诲瀷', title: '绫诲瀷' }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, sort: true }
+                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 120 }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+                        //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
+                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 140 }
+                        //, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80 }
+                        //, { field: 'HDeptID', title: 'HDeptID', width: 80 }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
+                        //, { field: 'HMaterID', title: 'HMaterID', width: 80 }
+                        , { field: '瀛愪欢浠g爜', title: '瀛愪欢浠g爜' }
+                        , { field: '瀛愪欢鍚嶇О', title: '瀛愪欢鍚嶇О' }
+                        , { field: '瀛愪欢瑙勬牸', title: '瀛愪欢瑙勬牸' }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                        , { field: '鍘熸枡鎵规鍙�', title: '鍘熸枡鎵规鍙�' }
+                        //, { field: 'HMaterID2', title: 'HMaterID2', width: 80 }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        //, { field: 'HUnitID', title: 'HUnitID', width: 80 }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+                        , { field: '鍗曚綅', title: '鍗曚綅' }
+                        , { field: '璁惧妯″叿浠g爜', title: '璁惧妯″叿浠g爜' }
+                        , { field: '璁惧妯″叿', title: '璁惧妯″叿' }
+                        , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+                        , { field: '鎽樿', title: '鎽樿' }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+                        , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+                        , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+                        //, { field: 'HBillType', title: 'HBillType', width: 80 }
+                        //, { field: 'hsubid', title: 'hsubid', width: 80 }
+                        , { field: '鎷嗗垎鏁伴噺', title: '鎷嗗垎鏁伴噺' }
+                    ]]
+                    , text: "鏃犳暟鎹�!"
+                };
+                table.render(option);
+            }
+
+            //鍒濆鍖栦粠琛ㄥ垪琛�
+            function set_InitGrid2() {
+                option2 = {
+                    elem: '#mainTable2'
+                    //, toolbar: '#toolbarDemo'
+                    , page: true
+                    , height: 226
+                    , cellMinWidth: 90
+                    , cols: [[
+                        //{ field: 'hsubid', title: 'hsubid' }
+                        { field: '娴佹按鍙�', title: '娴佹按鍙�' }
+                        //, { field: 'HProcID', title: 'HProcID' }
+                        , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+                        , { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
+                        , { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
+                        , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜', width: 115 }
+                        , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
+                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
+                        //, { field: 'hmainid', title: 'hmainid' }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        //, { field: 'hicmointerid', title: 'hicmointerid' }
+                        , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+                        //, { field: 'HWorkShopID', title: 'HWorkShopID' }
+                        , { field: '鐢熶骇杞﹂棿浠g爜', title: '鐢熶骇杞﹂棿浠g爜', width: 115 }
+                        , { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
+                        //, { field: 'HMaterID', title: 'HMaterID' }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜' }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+                        , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+                        , { field: '鎵瑰彿', title: '鎵瑰彿' }
+                        //, { field: 'HUnitID', title: 'HUnitID' }
+                        , { field: '鍗曚綅浠g爜', title: '鍗曚綅浠g爜' }
+                        , { field: '鍗曚綅', title: '鍗曚綅' }
+                        , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+                        , { field: '璁″垝寮�宸ユ棩鏈�', title: '璁″垝寮�宸ユ棩鏈�' }
+                        , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡' }
+                        , { field: '鎽樿', title: '鎽樿' }
+                        , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�' }
+                        //, { field: 'HSupID', title: 'HSupID' }
+                        , { field: '濮斿鍔犲伐鍗曚綅浠g爜', title: '濮斿鍔犲伐鍗曚綅浠g爜' }
+                        , { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
+                        , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+                        //, { field: 'HBillType', title: 'HBillType' }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
+                        , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺' }
+                        , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺' }
+                        , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺' }
+                        , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+                        , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
+                        , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+                        , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+                        , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+                        , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+                        , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+                        , { field: '姹囨姤鏁伴噺', title: '姹囨姤鏁伴噺' }
+                        , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+                        , { field: '鍑虹珯娴佽浆宸ュ簭', title: '鍑虹珯娴佽浆宸ュ簭' }
+                        , { field: '棣栭亾宸ュ簭', title: '棣栭亾宸ュ簭' }
+                        , { field: '鏈亾宸ュ簭', title: '鏈亾宸ュ簭' }
+                        , { field: '涓嬮亾宸ュ簭鍙�', title: '涓嬮亾宸ュ簭鍙�' }
+                        , { field: '涓嶈壇鍝佸叧鑱旀暟閲�', title: '涓嶈壇鍝佸叧鑱旀暟閲�' }
+                    ]]
+                };
+                table.render(option2);
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere)
+            {
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+                    }
+                });
+            }
+
+            //#endregion
+           
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 8dd55c1..9e87e5f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -14,236 +14,355 @@
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <!--鑷畾涔夋牱寮�-->
     <style>
-        .maintitle {
-            background-color: #1492ff;
-            color: #fff;
-            padding: 5px 10px;
-            border: none;
-            border-radius: 4px;
-        }
-
-        .title {
-            border-left: 4px solid #1492ff;
-            padding-left: 6px;
-            margin: 20px 10px 4px;
-            font-size: 16px;
-            color: #333;
-        }
-
-        .buttom_box_little {
-            width: 100px;
-            height: 36px;
-            color: #fff;
-            background-color: #1492ff;
-            border-radius: 4px;
-            border: none;
-            margin: 10px;
+        .layui-form-item .layui-inline {
+            margin-right: 0;
         }
     </style>
 </head>
 
 <body>
     <div class="layui-fluid" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
+        <div class="layui-card" style="padding: 2px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <div class="maintitle">宸ュ簭杩涚珯鎺ユ敹</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <label class="layui-form-label" style="width: 85px;"><span style="color:red;">*</span>鏉″舰鐮�</label>
-                            <div class="layui-input-block" style="margin-left: 120px;width:46%;">
-                                <input type="text" name="HBarCode" id="HBarCode" lay-verify="required" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
-                            </div>
+                    <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>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Modify" id="set_Modify">淇敼</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver" id="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">瀹℃牳</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                         </div>
                     </div>
-                    <div class="title">鍩烘湰淇℃伅</div>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">娴佽浆鍗�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
-                                </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <h2>宸ュ簭杩涚珯鎺ユ敹鍗�</h2>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" name="HInterID" id="HInterID">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">娴佹按鍙�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">娴佽浆鍗℃暟閲�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">褰撳墠宸ュ簭</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヤ綔涓績</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                    </button>
-                                    <input type="hidden" name="HCenterID" id="HCenterID" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">鎺ユ敹鏁伴噺</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧浠g爜</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鎺ユ敹浜�</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                    <input type="hidden" value="0" name="HEmpID" id="HEmpID">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">浜у搧鍚嶇О</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" name="HMaterID" id="HMaterID">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">璁㈠崟璺熻釜鍙�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">杩涚珯鏃堕棿</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">浠诲姟鍗�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
-                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇鐝粍</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                    <input type="hidden" value="0" name="HGroupID" id="HGroupID">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">浠诲姟鍗曟暟閲�</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇璧勬簮</label>
-                                <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="padding: 0 10px;float: left;margin-right: 3px;">
-                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                    </button>
-                                    <input type="hidden" value="0" name="HSourceID" id="HSourceID">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="" style="width: 85%;">
-                                <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <textarea name="HRemark" id="HRemark" placeholder="璇疯緭鍏ュ唴瀹�" class="layui-textarea"></textarea>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label"><span style="color:red;">*</span>鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBarCode" id="HBarCode" placeholder="璇烽敭鍏ュ悗鍥炶溅" autocomplete="off" class="layui-input">
                                 </div>
                             </div>
                         </div>
                     </div>
-                    <div class="title">鍏朵粬淇℃伅</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;">鎺ユ敹浠舵暟</label>
-                                <div class="layui-input-block" style="margin-left: 120px;">
-                                    <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                            <li lay-id="3" style="padding:1px;">闄勪欢淇℃伅</li>
+                            <li lay-id="4" style="padding:1px;">鍒跺崟淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HInterID" id="HInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鍗曟嵁鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鐢熶骇璁㈠崟鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOBillNo" id="HICMOBillNo" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HICMOInterID" id="HICMOInterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HICMOQty" id="HICMOQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>浜у搧浠g爜</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浜у搧鍚嶇О</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HMaterID" id="HMaterID">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佽浆鍗″彿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>褰撳墠宸ュ簭</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPlanQty" id="HPlanQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionTeam-BT" id="ProductionTeam-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>鎺ユ敹鏁伴噺</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HQty" id="HQty" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
+                                                <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs8 layui-inline">
+                                            <label class="layui-form-label">澶囨敞</label>
+                                            <div class="layui-input-block">
+                                                <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鎺ユ敹浠舵暟</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HPieceQty" id="HPieceQty" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮2</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮3</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮4</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐢熶骇璧勬簮5</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                </button>
+                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杩涚珯鏃堕棿</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--闄勪欢淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-upload">
+                                        <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
+                                        <div class="layui-upload-list">
+                                            <table class="layui-table">
+                                                <thead>
+                                                    <tr>
+                                                        <th>鏂囦欢鍚�</th>
+                                                        <th>澶у皬</th>
+                                                        <th>鐘舵��</th>
+                                                        <th>鎿嶄綔</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="ProImgByList">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--鍒跺崟淇℃伅-->
+                            <div class="layui-tab-item">
+                                <div class="layui-form-item">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍒跺崟鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鍏抽棴鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="title">闄勪欢淇℃伅</div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-upload">
-                            <button type="button" class="layui-btn" id="testList">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
-                            <div class="layui-upload-list">
-                                <table class="layui-table">
-                                    <thead>
-                                        <tr>
-                                            <th>鏂囦欢鍚�</th>
-                                            <th>澶у皬</th>
-                                            <th>鐘舵��</th>
-                                            <th>鎿嶄綔</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody id="ProImgByList">
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layer-footer" style="text-align: center;">
-                        <button type="button" lay-submit="" class="buttom_box_little" lay-filter="Saver">鎻愪氦</button>
-                        <button type="button" class="buttom_box_little" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
                     </div>
                     <!--闅愯棌瀛楁-->
                     <input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
@@ -269,41 +388,21 @@
                 , form = layui.form
                 , upload = layui.upload
                 , element = layui.element;
-            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
-            $("#HBarCode").focus();
-            /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
-            /* 1.鏃犳簮鍗曟柊澧�
-             * 2.鏈夋簮鍗曟柊澧�
-             * 3.缂栬緫
-             * 4.娴忚
-             * 5.鍙樻洿
-             */
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-            var params = getUrlVars();
+            var params = get_UrlVars();
             if (typeof (params[params[0]]) == "undefined") {
                 var OperationType = 1;//鎿嶄綔绫诲瀷
             } else {
                 var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
                 var linterid = params[params[1]];//婧愬崟id
-                var HBillNo = params[params[2]];  //鑾峰彇鍗曟嵁鍙�
+                var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+                var HBillNo = params[params[3]];//鍗曟嵁鍙�
             }
             /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
 
             //鍒ゆ柇鏄惁鏂板
             if (OperationType == 1) {
-                $("#HInterID").val("");
-                $("#HBillNo").val("");
                 //鑾峰彇鏈�澶у崟鎹彿
+                var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + "/Web/GetMAXNum",
                     type: "GET",
@@ -313,15 +412,128 @@
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
                         PicUpload();
+                        layer.close(ajaxLoad);
+                    }
+                    , error: function () {
+                        layer.close(ajaxLoad);
+                        layer.msg("鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇峰埛鏂伴噸璇曪紒");
                     }
                 });
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
             }
             else if(OperationType == 3){
                 $("#eventType").val("Modify");
                 RoadBillMain(linterid);
+                $('#set_Modify').addClass("layui-btn-disabled").attr("disabled", true);//淇敼鎸夐挳绂佺敤
+                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//淇濆瓨鎸夐挳鍚敤
+                $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳榛樿绂佺敤
+                $('#set_AbandonCheck').addClass("layui-btn-disabled").attr("disabled", true);//鍙嶅鏍告寜閽粯璁ょ鐢�
+                //RoadBillSub(linterid);
+            }
+            else if (OperationType == 4) {
+                RoadBillMain(linterid);
+                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庝繚瀛樻寜閽鐢�
+                $('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//瀹℃牳鎸夐挳鍚敤
+                $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
                 //RoadBillSub(linterid);
             }
 
+            //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
+            $("#HBarCode").focus();
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 鏂板鎸夐挳
+            form.on('submit(set_AddNew)', function () {//鎻愪氦
+                layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    window.location.reload();
+                });
+            })
+            //#endregion
+
+            //#region 淇敼鎸夐挳
+            form.on('submit(set_Modify)', function () {//鎻愪氦
+                //缂栬緫鍓嶅垽鏂�
+                set_ShowBillJudge();
+            })
+            //#endregion
+
+            //#region 鎻愪氦鎸夐挳
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                //var tableData = data.field;
+                if ($("#lngBillSubKey").val() == 0) {
+                    layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var oMain = data.field;
+                var index = layer.load();
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",
+                    async: true,
+                    data: { "oMain": oMain },
+                    dataType: "json",
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.close(index);
+                            layer.msg("鎻愪氦鎴愬姛");
+                            //淇濆瓨鍚庢祻瑙�
+                            ReRoadBillMain();
+                        }
+                        else {
+                            layer.close(index);
+                            layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.close(index);
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    }
+                });
+            });
+            //#endregion
+
+            //#region 閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    if (OperationType == 1) {
+                        Pub_Close(2);
+                    } else if (OperationType == 3) {
+                        Pub_Close(1);
+                    } else if (OperationType == 4) {
+                        Pub_Close(1);
+                    }
+                });
+            })
+            //#endregion
+
+            //#region 瀹℃牳鎸夐挳
+            form.on('submit(set_CheckBill)', function () {
+                //瀹℃牳鏂规硶
+                set_CheckBill();
+            })
+            //#endregion
+
+            //#region 鍙嶅鏍告寜閽�
+            form.on('submit(set_AbandonCheck)', function () {
+                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
+                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
+                });
+            })
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Cj_StationInBill.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
             function RoadBillMain(linterid)//鍔犺浇琛ㄥご
             {
                 var index = layer.load();
@@ -356,6 +568,62 @@
                     }
                 })
             }
+            //#endregion
+
+            //#region 缂栬緫鍓嶅垽鏂�
+            function set_ShowBillJudge() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HBillNo": HBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            location.replace('Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=&HBillNo=' + HBillNo);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 瀹℃牳鏂规硶
+            function set_CheckBill() {
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_CheckBill",
+                    data: { "HInterID": linterid, "CurUserName": sessionStorage["HUserName"] },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            layer.alert(result.Message, { icon: 6 });
+                            $('#set_CheckBill').addClass("layui-btn-disabled").attr("disabled", true);//瀹℃牳鎸夐挳绂佺敤
+                            $('#set_AbandonCheck').removeClass("layui-btn-disabled").attr("disabled", false);//鍙嶅鏍告寜閽惎鐢�
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+
+            //#endregion
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+
+            //#endregion
+
+        //#endregion
+
 
             //鏂囦欢涓婁紶
             function PicUpload() {
@@ -459,7 +727,8 @@
             //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁�
             var HProcExchBillNoFlag = false;
             //鍒濆鍩烘湰淇℃伅璧嬪��
-            $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            $("#HStationInTime").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
+            $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
             //$("#HEmpID").val(sessionStorage["Czybm"]);
             //$("#HEmp").val(sessionStorage["HUserName"]);
             $("#HMaker").val(sessionStorage["HUserName"]);
@@ -564,54 +833,6 @@
                 });
             }
 
-            //閫�鍑�-鍏抽棴椤甸潰鏂规硶
-            $('#Cancel').on('click', function () {
-                layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电
-                });
-            })
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-                //var tableData = data.field;
-                if ($("#lngBillSubKey").val() == 0) {
-                    layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    return;
-                }
-                var oMain = data.field;
-                var index = layer.load();
-                $.ajax({
-                    type: "POST",
-                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",
-                    //url:"http://localhost:12761/Cj_StationEntrustOutBill/AddBill",
-                    async: true,
-                    data: { "oMain": oMain },
-                    dataType: "json",
-                    success: function (data) {
-                        if (data.count == 1) {
-                            //layer.confirm(data.Message, {
-                            //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                            //    btn2: function () {
-                            //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                            //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                            //        parent.location.href = "../../../views/index.html"
-                            //    }//鍏抽棴
-                            //}, function () { window.location.reload(); });//鏂板
-                            layer.close(index);
-                            layer.msg("鎻愪氦鎴愬姛");
-                        }
-                        else {
-                            layer.close(index);
-                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    },
-                    error: function (err) {
-                        layer.close(index);
-                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                    }
-                });
-            });
-
             //閫夋嫨鐢熶骇鐝粍寮圭獥
             form.on('submit(ProductionTeam-BT)', function () {//閫夋嫨鐢熶骇鐝粍
                 layer.open({
@@ -664,10 +885,6 @@
                 layer.msg('绂佹閫夋嫨');
             });
 
-            //閫夋嫨浜у搧
-            form.on('submit(btnSearchMater)', function () {
-                layer.msg('绂佹閫夋嫨');
-            });
 
             //浠ヤ笂涓簂ayui妯″潡
         });
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 3ddeb05..9cf037a 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -77,8 +77,8 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="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" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-FirstPieceCheck" id="btn-FirstPieceCheck">棣栨</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell" id="btn-Cell"><i class="layui-icon layui-icon-ok"></i>淇濆瓨鍒楀</button>
@@ -163,6 +163,56 @@
                 };
             });
 
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region缂栬緫鍓嶅垽鏂�
+            function set_ShowBillJudge(data) {
+                var HBillNo = data[0].鍗曟嵁鍙�;
+                var wait = layer.load();
+                $.ajax({
+                    type: "GET",
+                    url: GetWEBURL() + "/Cj_StationInBill/set_ShowBillJudge", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    data: { "HBillNo": HBillNo },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            //鎵撳紑缂栬緫椤甸潰
+                            set_ShowBill_open(data);
+                        } else {
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                        layer.close(wait);
+                    }, error: function () {
+                        layer.close(wait);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 鎵撳紑缂栬緫椤甸潰
+            function set_ShowBill_open(data) {
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
+                    , shade: 0.6
+                    , maxmin: false
+                    , anim: 0
+                    , content: ['Cj_StationInBill.html?OperationType=4&linterid=' + data[0].HInterID + '&HSouceBillType=&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        btnIs();
+                    }
+                    , end: function () {
+                        get_FastQuery(table, option);
+                    }
+                })
+            }
+            //#endregion
+
+        //#endregion
+
             //鍔熻兘鎸夐挳鏄惁绂佺敤鏂规硶锛屾瘡娆″姞杞借〃鏍奸兘瑕佽皟鐢�
             function btnIs() {
                 //$('#btn-Add').addClass("layui-btn-disabled").attr("disabled", true);//鏂板鎸夐挳
@@ -235,11 +285,11 @@
                     url: GetWEBURL() + '/Cj_StationInBill/get_Display',
                     type: "GET",
                     data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 0) {
+                    success: function (result) {
+                        if (result.count == 0) {
                             option.data = [];
                         } else {
-                            option.data = data1.data;
+                            option.data = result.data;
                         }
                         table.render(option);
                         btnIs();
@@ -298,22 +348,10 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    layer.open({
-                        type: 2
-                        , area: ['100%', '100%']
-                        , title: '宸ュ簭杩涚珯鎺ユ敹鍗�-缂栬緫'
-                        , shade: 0.6
-                        , maxmin: false
-                        , anim: 0
-                        , content: ['Cj_StationInBill.html?OperationType='+3+'&linterid=' + data[0].HInterID + '&HBillNo=' + data[0].鍗曟嵁鍙�, 'yes']
-                        , resize: false
-                        , cancel: function () {
-                            btnIs();
-                        }
-                        , end: function () {
-                            get_FastQuery(table, option);
-                        }
-                    })
+                    //缂栬緫鍓嶅垽鏂�
+                    //set_ShowBillJudge(data);
+                    //鎵撳紑缂栬緫椤甸潰
+                    set_ShowBill_open(data);
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
index d259456..bd2a121 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\247\224\345\244\226\345\207\272\345\272\223/Kf_EntrustOutBill_Fast.html"
@@ -665,16 +665,16 @@
 
         //鎵簮鍗曞彿
         $('#HSourceBillNo').on('keydown', function (event) {
-            var sSourceBillNo = $('#HSourceBillNo').val()
-            var sNewInterID = $("#HInterID").val()
-            var sNewBillNo = $("#HBillNo").val()
+            var HSourceBillNo = $('#HSourceBillNo').val()
+            var sInterID = $("#HInterID").val()
+            var sBillNo = $("#HBillNo").val()
             var HSourceBillType = $("#HBillType").val();
             if (event.keyCode == 13) {
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
                     url: GetWEBURL() + "/EntrustOut/set_SavePonderationBillMain_Temp_Entrust_Source_Fast_Json",
                     type: "GET",
-                    data: { "sNewInterID": sNewInterID, "sNewBillNo": sNewBillNo, "sSourceBillNo": sSourceBillNo, "HSourceBillType": HSourceBillType },
+                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                     success: function (result) {
                         if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             $("#rizhi").val(RZ += Format(new Date(), "yyyy-MM-dd hh:mm:ss.S") + "鎵簮鍗曞彿锛屾垚鍔焅n");

--
Gitblit v1.9.1