From b2d4a9c6e5c2ddddb9635d146b689823627b1fbe Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期五, 27 八月 2021 08:49:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/基础资料/生产基础资料/Gy_BadReason.html                   |  290 ++-
 WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html               |  318 +--
 WebTM/views/模治具管理/模治具管理/Gy_Mould_Edit.html                  |  940 ++++++-----
 WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html |    2 
 WebTM/Properties/PublishProfiles/JFTM.pubxml.user           |   49 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html                    |  110 
 WebTM/views/PublicPage/LocationGroupInformation.html        |  254 +++
 WebTM/views/Baseset/基础资料/Gy_ProcList.html                   |    4 
 WebTM/views/设备管理/Sb_Add_EqpMaintenanceBillList.html         |    1 
 WebTM/views/Baseset/基础资料/Gy_DepartmentList.html             |    4 
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html                    |  383 ++--
 WebTM/views/PublicPage/RouteInformation.html                |  165 ++
 WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html              |   83 
 WebTM/views/模治具管理/模治具管理/Gy_Mould.html                       |  359 ++-
 WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html               |  485 +++---
 WebTM/views/PublicPage/BomGroupInformation.html             |  254 +++
 WebTM/layuiadmin/Scripts/webConfig.js                       |    4 
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html                   |   16 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html          |  719 +++------
 WebTM/WebTM.csproj                                          |    3 
 20 files changed, 2,557 insertions(+), 1,886 deletions(-)

diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index 947d805..bdef852 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -15,10 +15,10 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="bin/WebTM.dll">
-      <publishTime>08/25/2021 16:22:54</publishTime>
+      <publishTime>08/26/2021 16:58:28</publishTime>
     </File>
     <File Include="bin/WebTM.pdb">
-      <publishTime>08/25/2021 16:22:54</publishTime>
+      <publishTime>08/26/2021 16:58:28</publishTime>
     </File>
     <File Include="layuiadmin/config.js">
       <publishTime>06/10/2021 11:10:38</publishTime>
@@ -639,7 +639,7 @@
       <publishTime>06/10/2021 11:10:38</publishTime>
     </File>
     <File Include="layuiadmin/Scripts/webConfig.js">
-      <publishTime>08/24/2021 19:39:47</publishTime>
+      <publishTime>08/26/2021 10:36:52</publishTime>
     </File>
     <File Include="layuiadmin/style/admin.css">
       <publishTime>06/10/2021 11:10:38</publishTime>
@@ -1094,6 +1094,9 @@
     <File Include="views/IpadIndex.html">
       <publishTime>08/20/2021 17:14:43</publishTime>
     </File>
+    <File Include="views/PublicPage/BomGroupInformation.html">
+      <publishTime>08/26/2021 16:15:10</publishTime>
+    </File>
     <File Include="views/PublicPage/CheckItemInformation.html">
       <publishTime>08/24/2021 18:56:43</publishTime>
     </File>
@@ -1124,6 +1127,9 @@
     <File Include="views/PublicPage/Gy_MaterType.html">
       <publishTime>08/24/2021 19:07:17</publishTime>
     </File>
+    <File Include="views/PublicPage/LocationGroupInformation.html">
+      <publishTime>08/26/2021 16:25:29</publishTime>
+    </File>
     <File Include="views/PublicPage/MouldInformation.html">
       <publishTime>08/24/2021 19:07:40</publishTime>
     </File>
@@ -1141,6 +1147,9 @@
     </File>
     <File Include="views/PublicPage/RepairItemInformation.html">
       <publishTime>08/24/2021 19:09:21</publishTime>
+    </File>
+    <File Include="views/PublicPage/RouteInformation.html">
+      <publishTime>08/26/2021 16:55:21</publishTime>
     </File>
     <File Include="views/PublicPage/SourceInformation.html">
       <publishTime>08/24/2021 19:10:03</publishTime>
@@ -1338,7 +1347,7 @@
       <publishTime>08/25/2021 16:22:12</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html">
-      <publishTime>08/16/2021 13:31:17</publishTime>
+      <publishTime>08/25/2021 16:22:12</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Add_Edit_Gy_QCCheckClass.html">
       <publishTime>08/25/2021 16:22:40</publishTime>
@@ -1353,7 +1362,7 @@
       <publishTime>07/24/2021 00:34:41</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
-      <publishTime>08/24/2021 19:25:14</publishTime>
+      <publishTime>08/25/2021 16:46:07</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
       <publishTime>08/20/2021 19:30:05</publishTime>
@@ -1380,7 +1389,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html">
-      <publishTime>08/24/2021 19:25:14</publishTime>
+      <publishTime>08/25/2021 16:46:07</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html">
       <publishTime>08/20/2021 19:30:05</publishTime>
@@ -1425,10 +1434,10 @@
       <publishTime>08/20/2021 19:30:05</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
-      <publishTime>08/25/2021 15:23:16</publishTime>
+      <publishTime>08/26/2021 16:51:26</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.html">
-      <publishTime>08/16/2021 13:31:17</publishTime>
+      <publishTime>08/26/2021 16:51:26</publishTime>
     </File>
     <File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">
       <publishTime>08/20/2021 19:30:05</publishTime>
@@ -1614,10 +1623,10 @@
       <publishTime>07/02/2021 16:55:33</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇閫�搴撳崟/Sc_MouldProdBackBill_PDA.html">
-      <publishTime>08/06/2021 18:43:46</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿鐢熶骇棰嗙敤鍗�/Sc_MouldProdOutBill_PDA.html">
-      <publishTime>08/06/2021 18:43:46</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯″叿缁翠慨璁板綍鍗�/Sc_MouldRepairWorkBill_PDA.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
@@ -1674,16 +1683,16 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>08/26/2021 13:57:56</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould_Edit.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>08/26/2021 16:47:57</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>08/20/2021 19:46:14</publishTime>
+      <publishTime>08/25/2021 20:37:59</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
       <publishTime>08/22/2021 08:56:37</publishTime>
@@ -1767,13 +1776,13 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Gy_Mould.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>08/26/2021 13:57:56</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Kf_ProductInBillList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_Add_MouldRepairWorkBillList.html">
-      <publishTime>08/20/2021 19:46:14</publishTime>
+      <publishTime>08/25/2021 20:37:59</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sb_MouldRepairWorkBillList.html">
       <publishTime>08/22/2021 08:56:37</publishTime>
@@ -1833,10 +1842,10 @@
       <publishTime>08/13/2021 17:36:43</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBill.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherInBillList.html">
-      <publishTime>07/02/2021 16:55:33</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/妯℃不鍏风鐞�/妯℃不鍏风鐞�/Sc_MouldOtherOutBill.html">
       <publishTime>07/02/2021 16:55:33</publishTime>
@@ -2277,7 +2286,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBill.html">
-      <publishTime>08/24/2021 19:38:55</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/杞﹂棿绠$悊/宸ュ簭娴佽浆鍗�/Sc_ProcessExchangeBillList.html">
       <publishTime>08/18/2021 08:26:14</publishTime>
@@ -2379,7 +2388,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_Fast.html">
-      <publishTime>08/17/2021 18:30:23</publishTime>
+      <publishTime>08/25/2021 20:38:04</publishTime>
     </File>
     <File Include="views/棰嗘枡鍙戣揣/濮斿鍑哄簱/Kf_EntrustOutBill_FastList.html">
       <publishTime>06/10/2021 11:10:39</publishTime>
@@ -2499,7 +2508,7 @@
       <publishTime>06/10/2021 11:10:39</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/25/2021 16:23:03</publishTime>
+      <publishTime>08/26/2021 16:58:39</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 8ad5cb5..b36352c 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -105,6 +105,9 @@
     <Content Include="views\grf\a.grf" />
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
+    <Content Include="views\PublicPage\LocationGroupInformation.html" />
+    <Content Include="views\PublicPage\BomGroupInformation.html" />
+    <Content Include="views\PublicPage\RouteInformation.html" />
     <Content Include="views\PublicPage\Gy_MaterType.html" />
     <Content Include="views\PublicPage\CheckItemInformation.html" />
     <Content Include="views\PublicPage\Gy_Maintain.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f2d0f60..fe893d5 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,10 +1,10 @@
 锘縡unction GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
-    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
+    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index d869a5a..d2fb649 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -29,7 +29,9 @@
             </div>
         </div>
     </div>
-    <table class="layui-hide" id="ck-table"></table>
+    <table class="layui-hide" id="ck-table">
+
+    </table>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
index c2ea148..7c4a893 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcList.html"
@@ -29,7 +29,9 @@
             </div>
         </div>
     </div>
-    <table class="layui-hide" id="ck-table"></table>
+    <table class="layui-hide" id="ck-table">
+
+    </table>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
diff --git a/WebTM/views/PublicPage/BomGroupInformation.html b/WebTM/views/PublicPage/BomGroupInformation.html
new file mode 100644
index 0000000..8530d79
--- /dev/null
+++ b/WebTM/views/PublicPage/BomGroupInformation.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>Bom缁勮祫鏂�</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%;display:none;">
+                                            <div id="treeBomGroup" lay-filter="treeBomGroup" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs12 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: '#treeBomGroup',
+            //    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/BomGroupCX',
+            //            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: 'BOM缁勪唬鐮�' }
+                    , { field: 'HName', title: 'BOM缁勫悕绉�' }
+                ]]
+            };
+
+            var index = layer.load(0, { shade: false });
+            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            $.ajax({
+                url: GetWEBURL() + '/PublicPageMethod/BomGroupList',
+                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/BomGroupList',
+                    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/BomGroupLoadTree',
+                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/LocationGroupInformation.html b/WebTM/views/PublicPage/LocationGroupInformation.html
new file mode 100644
index 0000000..11d6616
--- /dev/null
+++ b/WebTM/views/PublicPage/LocationGroupInformation.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%;display:none;">
+                                            <div id="treeLocationGroup" lay-filter="treeLocationGroup" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+                                        </div>
+                                        <div class="layui-col-xs12 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: '#treeLocationGroup',
+            //    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/HSPGroupCX',
+            //            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/HSPGroupList',
+                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/HSPGroupList',
+                    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/HSPGroupLoadTree',
+                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/RouteInformation.html b/WebTM/views/PublicPage/RouteInformation.html
new file mode 100644
index 0000000..4349ae2
--- /dev/null
+++ b/WebTM/views/PublicPage/RouteInformation.html
@@ -0,0 +1,165 @@
+锘�<!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-xs12 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 sWhere1 = "";  //鍒楄〃
+
+            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/RouteList',
+                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/DeptList',
+                    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 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/\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"
index 1cccd5f..0504dba 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_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"
@@ -184,13 +184,13 @@
                         { 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 }
+                        , { field: 'HNumber', title: '浠g爜', width: 150 }
+                        , { field: 'HName', title: '鍚嶇О', width: 150 }
+                        , { field: 'HLevel', title: '绛夌骇', width: 150 }
+                        , { field: 'HEndFlag', title: '鏄庣粏鏍囪', width: 150 }
+                        , { field: 'HStopFlag', title: '绂佺敤鏍囪', width: 150 }
+                        , { field: 'HRemark', title: '澶囨敞', width: 150 }
+                        , { field: 'HUseFlag', title: '浣跨敤鏍囪', width: 150 }
                     ]]
                 };
             }
@@ -227,7 +227,7 @@
                 layer.open({
                     type: 2,
                     skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板妫�楠岄」鐩�',
+                    title: '鏂板妯℃不鍏峰垎绫�',
                     closeBtn: 1,
                     shift: 2,
                     area: ['80%', '80%'],
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
index f3fd7f2..3d2103c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_BadReason.html"
@@ -20,8 +20,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" 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>
 
@@ -35,81 +34,68 @@
                                 <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-xs4">
-                                                    <label class="layui-form-label">浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
-                                                        <input id="HItemID" name="HItemID" type="hidden" />
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4">
-                                                    <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-xs4">
-                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
-                                                    <div class="layui-input-inline">
-                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
-
-                                                    </div>
-                                                </div>
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿閮ㄩ棬浠g爜锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
-
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿閮ㄩ棬锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HDepName" id="HDepName" lay-verify="HDepName" readonly="readonly" autocomplete="off" class="layui-input">
-                                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT">
-                                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                        </button>
-                                                        <input id="HDeptID" name="HDeptID" type="hidden" />
-                                                    </div>
-                                                </div>
-
-                                                <div class="layui-col-xs4">
-                                                    <label class="layui-form-label">榛樿宸ュ簭锛�</label>
-                                                    <div class="layui-input-inline">
-                                                        <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" readonly="readonly" 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" />
-                                                        <input id="HProcNumber" name="HProcNumber" type="hidden" />
-                                                    </div>
-                                                </div>
-
-
-                                            </div>
-                                        </div>
-
-                                        <div class="layui-form-item" pane>
-                                            <div class="layui-col-xs5">
-                                                <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">浠g爜锛�</label>
                                                 <div class="layui-input-inline">
-                                                    <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
-                                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                                    <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber" autocomplete="off">
+                                                    <input  name="HItemID"  id="HItemID" autocomplete="off" type="hidden">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍚嶇О锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">鍔╄鐮侊細</label>
+                                                <div class="layui-input-inline">
+                                                    <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
                                                 </div>
                                             </div>
                                         </div>
-
                                         <div class="layui-form-item">
-                                            <div class="layui-row">
-                                                <div class="layui-col-xs11">
-                                                    <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" style="width: 120px">榛樿閮ㄩ棬浠g爜锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="" readonly="readonly" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">榛樿閮ㄩ棬锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HDepName" id="HDepName" lay-verify="HDepName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDepart-BT" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn " style="margin-left:-9px"></i>
+                                                    </button>
+                                                    <input id="HDeptID" name="HDeptID" type="hidden" />
+                                                </div>
+                                            </div>
+                                            <div class="layui-inline">
+                                                <label class="layui-form-label" style="width: 120px">榛樿宸ュ簭锛�</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HProcName" id="HProcName" lay-verify="HProcName" readonly="readonly" autocomplete="off" class="layui-input" style="float:left;width:150px;">
+                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HProc-BT" style="width:40px;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px"></i>
+                                                    </button>
+                                                    <input id="HProcID" name="HProcID" type="hidden" />
+                                                    <input id="HProcNumber" name="HProcNumber" type="hidden" />
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label"> 绂佺敤鏍囧織:</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true">
+                                                <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-col-xs11">
+                                                <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                <div class="layui-input-block">
+                                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
                                                 </div>
                                             </div>
                                         </div>
@@ -117,7 +103,6 @@
                                 </div>
                             </div>
                         </div>
-
                     </form>
                 </div>
             </div>
@@ -128,126 +113,128 @@
     <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;
+            //#endregion
 
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //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;
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
 
-            function RoadBillMain(hID)//鍔犺浇琛ㄥご
-            {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
-                $.ajax({
-                    url: GetWEBURL() + "GetGy_BadReasonDetail",
-                    type: "GET",
-                    data: {
-                        "HID": hID
-                    },
-                    success: function (result) {
-                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_IF_Edit_BadReasonList[0];
-                            var IsHStopflag = data.绂佺敤鏍囪;
-                            //绂佺敤鏍囪
-                            if (IsHStopflag == "true") {
-                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//淇濆瓨
+                
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+                var sMainStr = JSON.stringify(data.field);
+                if (AllowLoadData()) {
+                    $.ajax(
+                        {
+                            type: "POST",
+                            url: GetWEBURL() + "SaveGy_BadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            async: true,
+                            data: { "msg": sMainStr },
+                            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);
                             }
-                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
-                                "HNumber": data.涓嶈壇鍘熷洜浠g爜
-                                , "HItemID": data.HItemID
-                                , "HName": data.涓嶈壇鍘熷洜鍚嶇О
-                                , "HHelpCode": data.鍔╄浠g爜
-                                , "HDeptNumber": data.閮ㄩ棬浠g爜
-                                , "HDepName": data.閮ㄩ棬鍚嶇О
-                                , "HDeptID": data.閮ㄩ棬ID
-                                , "HProcName": data.宸ュ簭鍚嶇О
-                                , "HProcID": data.宸ュ簭ID
-                                , "HProcNumber": data.宸ュ簭浠g爜
-                                , "HStopflag": data.绂佺敤鏍囪
-                                , "HRemark": data.澶囨敞
-                            });
-
-                        } else {
-                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
-                        }
-                    }, error: function () {
-                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
-                    }
-                });
-            }
-
-
-            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) {
-                //id new
-                $("#HItemID").val(0);
-            }
-            else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
-                $("#HItemID").val(hID);//淇敼鏃朵富琛↖D
-                RoadBillMain(hID);
-               
-               /* RoadBillSub(linterid);*/
-            }
-
-            form.on('checkbox(checkboxHStopflag)', function (data) {
-                $("#HStopflag").val(data.elem.checked);
+                        });
+                }
             });
-
-            //閫夋嫨浜у搧寮圭獥
-            form.on('submit(HMateria-BT)', function () {//浜у搧
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                if (linterid == null || linterid == 0) {
+                    parent.location.href = "../../../views/index.html"
+                }
+                else {
+                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                }
+            });
+            //閫夋嫨榛樿閮ㄩ棬
+            form.on('submit(HDepart-BT)', function () {//閫夋嫨閮ㄩ棬
                 layer.open({
                     type: 2
                     , area: ['80%', '80%']
-                    , title: '鐗╂枡'
+                    , title: '閮ㄩ棬鍒楄〃'
                     , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+                    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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDepName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
                     }
                 })
             });
-            //閫夋嫨宸ュ簭
+            //閫夋嫨榛樿宸ュ簭
             form.on('submit(HProc-BT)', function () {//閫夋嫨宸ュ簭
                 layer.open({
                     type: 2
@@ -256,173 +243,37 @@
                     , shade: 0.6 //閬僵閫忔槑搴�
                     //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            //閫夋嫨渚涘簲鍟�
-            form.on('submit(HSupID-BT)', function () {//閫夋嫨渚涘簲鍟�
-                layer.open({
-                    type: 2
-                    , area: ['666px', '666px']
-                    , title: '渚涘簲鍟嗗垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨閮ㄩ棬
-            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); //鍐嶆墽琛屽叧闂�
-                parent.location.href = "../../../views/index.html"
-            });
-
-            //閫夋嫨璐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(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '鐢熶骇璧勬簮'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_GetProductionResourcesList.html', 'yes']
-                    , resize: false
-                    , cancel: function (index, layero) {
-                    }
-                })
-            });
-
-
-            form.on('submit(Exit)', function (data) {//閫�鍑�
-
-            });
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                if (hID == null || hID==0) {
-                    parent.location.href = "../../../views/index.html"
-                }
-                else
-                {
-                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
-                }
-                //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;
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "SaveGy_BadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        async: true,
-                        data: { "msg": sMainStr },
-                        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);
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        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('璇烽�夋嫨鏁版嵁');
                         }
-                    });
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                })
             });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-
+            ////绂佺敤鏍囧織
+            //form.on('checkbox(checkboxHStopflag)', function (data) {
+            //    $("#HStopflag").val(data.elem.checked);
+            //});
             //鐩戝惉鎻愪氦
             form.verify({
                 numberOrEmpty: function (value, item) {
@@ -433,139 +284,101 @@
                     //}
                 }
             });
+            //#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 GetHSupValue(obj) {  //杩斿洖渚涘簲鍟�
-            $("#HSupName").val(obj[0].HName);
-            $("#HSupID").val(obj[0].HItemID);
-            $("#HSupNumber").val(obj[0].HNumber);
-        }
-
-        function GetHKeeperValue(obj) {  //杩斿洖妫�楠屽憳
-            $("#HEmpName").val(obj[0].HName);
-            $("#HFirstCheckEmp").val(obj[0].HItemID);
-        }
-
-        //杩斿洖鐢熶骇璧勬簮
-        function GetProductionResourcesValue(obj) {  //杩斿洖鐢熶骇璧勬簮
-
-            $("#HSource").val(obj[0].鐢熶骇璧勬簮);
-            $("#HSourceID").val(obj[0].HItemID);
-        }
-
-        //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;
+            //#region 褰撳墠椤甸潰闈㈡墍鏈夌殑鏂规硶
+            
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $("#HItemID").val("0");
+                $("#HNumber").val("");
             }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
+            //缂栬緫
+            function set_EditFromGrid() {
+                $("#HItemID").val(linterid);
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
             }
-            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;
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_BadReasonDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_IF_Edit_BadReasonList[0];
+                            $("#HNumber").val(data.涓嶈壇鍘熷洜浠g爜);//浠g爜
+                            $("#HItemID").val(data.HItemID);//浠g爜ID
+                            $("#HName").val(data.涓嶈壇鍘熷洜鍚嶇О);//鍚嶇О
+                            $("#HHelpCode").val(data.鍔╄浠g爜);//鍔╄浠g爜
+                            $("#HDeptNumber").val(data.閮ㄩ棬浠g爜);//榛樿閮ㄩ棬浠g爜
+                            $("#HDepName").val(data.閮ㄩ棬鍚嶇О);//榛樿閮ㄩ棬
+                            $("#HDeptID").val(data.閮ㄩ棬ID);//閮ㄩ棬id
+                            $("#HProcName").val(data.宸ュ簭鍚嶇О);//榛樿宸ュ簭
+                            $("#HProcID").val(data.宸ュ簭ID);//宸ュ簭ID
+                            $("#HProcNumber").val(data.宸ュ簭浠g爜);//宸ュ簭浠g爜
+                            $("input[name='HStopflag']").prop("checked", data.绂佺敤鏍囪);//true:閫変腑 false:涓嶉�変腑
+                            layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                            $("#HRemark").val(data.澶囨敞);//澶囨敞
+
+                            //var IsHStopflag = data.绂佺敤鏍囪;
+                            ////绂佺敤鏍囪
+                            //if (IsHStopflag == "true") {
+                            //    $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            //}
+                            //form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                            //    "HNumber": data.涓嶈壇鍘熷洜浠g爜
+                            //    , "HItemID": data.HItemID
+                            //    , "HName": data.涓嶈壇鍘熷洜鍚嶇О
+                            //    , "HHelpCode": data.鍔╄浠g爜
+                            //    , "HDeptNumber": data.閮ㄩ棬浠g爜
+                            //    , "HDepName": data.閮ㄩ棬鍚嶇О
+                            //    , "HDeptID": data.閮ㄩ棬ID
+                            //    , "HProcName": data.宸ュ簭鍚嶇О
+                            //    , "HProcID": data.宸ュ簭ID
+                            //    , "HProcNumber": data.宸ュ簭浠g爜
+                            //    , "HStopflag": data.绂佺敤鏍囪
+                            //    , "HRemark": data.澶囨敞
+                            //});
+
+                        } else {
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
                     }
-                }
-                if (s == 0) {
-                    layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
+                if ($("#HHelpCode").val() == '') {
+                    layer.msg("璇峰~鍐欏姪璁扮爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     return false;
                 }
+                if ($("#HDeptNumber").val() == '') {
+                    layer.msg("璇烽�夋嫨榛樿閮ㄩ棬", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HDepName").val() == '') {
+                    layer.msg("璇烽�夋嫨榛樿宸ュ簭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
             }
-            else {
-                return true;
+            //
+            function f_alert(sMsg) {
+                layer.alert(sMsg, { icon: 5 });
+
             }
-        }
+            //#endregion
+        });
+
     </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/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
index c2e2e68..d17ff84 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BadReason.html"
@@ -16,7 +16,9 @@
         <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-colla-title layui-inline">
@@ -43,13 +45,16 @@
 
                             </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-Add"><i class="layui-icon layui-icon-form"></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>
                             </div>
                         </script>
+
                     </form>
                 </div>
             </div>
@@ -65,6 +70,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -73,127 +79,99 @@
             , element = layui.element
             , laypage = layui.laypage
             , laydate = layui.laydate
+            //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                , toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '涓嶈壇鍘熷洜浠g爜', title: '涓嶈壇鍘熷洜浠g爜' }
-                    , { field: '涓嶈壇鍘熷洜鍚嶇О', title: '涓嶈壇鍘熷洜鍚嶇О' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                ]]
-            };
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_BadReason/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 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#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].HItemID.toString();
-                            //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                            layer.open({
-                                type: 2
-                                , area: ['100%', '100%']
-                                , title: '缂栬緫涓嶈壇鍘熷洜'
-                                , shade: 0.6 //閬僵閫忔槑搴�
-                                , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                                , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                                , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.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 ItemID = data[0].HItemID.toString();
-                            //閫昏緫鍒犻櫎鏂规硶
-                            $.ajax({
-                                url: GetWEBURL() + 'DeltetGy_BadReason',
-                                type: "GET",
-                                data: { "HItemID": ItemID },
-                                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;
                 };
             });
-
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
-            });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '涓嶈壇鍘熷洜浠g爜', title: '涓嶈壇鍘熷洜浠g爜' }
+                        , { field: '涓嶈壇鍘熷洜鍚嶇О', title: '涓嶈壇鍘熷洜鍚嶇О' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_BadReason/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 });
+                    }
+                }); 
+            }
+            //蹇�熸煡璇�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -220,23 +198,101 @@
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            //閲嶇疆蹇�熸煡璇�
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            //鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板涓嶈壇鍘熷洜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.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].HItemID.toString();
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫涓嶈壇鍘熷洜'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_BadReason.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var HItemID = data[0].HItemID.toString();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            type: "GET",
+                            url: GetWEBURL() + "DeltetGy_BadReason", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                            data: { "HItemID": HItemID },
+                            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妯″潡
         });
-
-        
-
-
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index ac9a084..b522713 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -71,6 +71,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -79,55 +80,23 @@
             , element = layui.element
             , laypage = layui.laypage
             , laydate = layui.laydate
+            //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
-                    , { field: 'HItemID', title: 'HItemID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Supplier/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(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
@@ -157,16 +126,61 @@
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
+            //#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() {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
+                        , { field: 'HItemID', title: 'HItemID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_Supplier/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
+            
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 7986500..99d1b6f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -22,12 +22,12 @@
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
                     <!--<div class="maintitle">閮ㄩ棬</div>-->
                     <div style="padding: 10px;">
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="Saver">淇濆瓨</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="Add">鏂板</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="Check">瀹℃牳</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="FCheck">鍙嶅鏍�</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="Cancel">閫�鍑�</button>
+                        <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="print">鎵撳嵃</button>
                     </div>
                     <div class="layui-form-item" style="padding-top: 10px;">
                         <div class="layui-row">
@@ -211,92 +211,99 @@
                             </div>
                         </div>
                     </div>
-                        <!--<div class="title">鍩烘湰淇℃伅</div>-->
-                        <div class="layui-tab" lay-filter="tab-POStockInBill">
-                            <ul class="layui-tab-title" lay-filter="tab-all">
-                                <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                                <li lay-id="2" style="padding:1px;">鍏朵粬</li>
-                            </ul>
-                            <div class="layui-tab-content">
-                                <!--鍩烘湰淇℃伅-->
-                                <!--鍏朵粬淇℃伅-->
-                                <div class="layui-tab-item ">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                    <!--<div class="title">鍩烘湰淇℃伅</div>-->
+                    <div class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item ">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                            <!--<di-->
-                            <!--v class="layer-footer" style="text-align: center;">
-
-
-        </div>-->
-                            <!--闅愯棌瀛楁-->
-                            <input type="hidden" name="lngBillKey" id="lngBillKey">
-                            <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-                            <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
-</form>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+                    <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+                </form>
             </div>
         </div>
     </div>
+
     <script>
+        //鑾峰彇鍙傛暟
+        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 () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -307,71 +314,26 @@
                 , laydate = layui.laydate
                 , util = layui.util
             var sWhere = "";
+            //#endregion
 
 
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
             $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
-
-            //鑾峰彇鍙傛暟
-            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;
+            //鍒濆鍖栭〉闈�
+            set_ClearBill();
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_ClearBill();
             }
-
-            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var HType = params[params[1]];    //鍗曟嵁鐘舵��
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-
-
-            if (HType == "Modify") {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Supplier/xg",
-                    //url: "http://localhost:12761/Gy_Supplier/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
             }
             else {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
-                    type: "GET",
-                    data: { },
-                    success: function (d) {
-                        $("#HInterID").val(d.data[0].hitemid);
-                    }
-                });
-                //Initialization();
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
+            //#endregion
 
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
             //閫夋嫨楠屾敹
             form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
                 var sMainStr = JSON.stringify(data.field);
@@ -389,37 +351,6 @@
                     }
                 })
             });
-
-            ////閫夋嫨鍒涘缓缁勭粐
-            //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-            //    var sMainStr = JSON.stringify(data.field);
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '缁勭粐'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-
-
-            //鑾峰彇鏈�澶у熀纭�璧勬枡ID
-            $.ajax({
-                url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
-                type: "GET",
-                data: { },
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].hitemid);
-                }
-            });
-
             //鎵撳嵃Printing
             form.on("submit(print)", function (data) {
                 layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
@@ -427,28 +358,21 @@
                 window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
 
             });
-
             //鏂板
             form.on('submit(Add)', function () {
                 window.location.reload();
                 $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
             });
-
-            //瀹℃牳
-            form.on('submit(Check)', function () {
-                
-            });
-
-
             //閫�鍑�
             form.on('submit(Cancel)', function () {
                 layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
                     parent.location.href = "../../../views/index.html";
                 });
             });
+            //瀹℃牳
+            form.on('submit(Check)', function () {
 
-
-
+            });
             //鎻愪氦
             form.on('submit(Saver)', function (data) {//鎻愪氦
 
@@ -507,7 +431,7 @@
                         url: GetWEBURL() + "/Gy_Supplier/AddBill1",
                         //url: "http://localhost:12761/Gy_Supplier/AddBill1",
                         async: true,
-                        data: { "oMain": sBillModeify},
+                        data: { "oMain": sBillModeify },
                         dataType: "json",
                         success: function (data) {
                             if (data.count == 1) {
@@ -533,8 +457,7 @@
                         }
                     });
                 }
-                else
-                {
+                else {
                     $.ajax({
                         type: "POST",
                         url: GetWEBURL() + "/Gy_Supplier/AddBill",
@@ -567,22 +490,55 @@
                     });
                 }
             });
+            //#endregion
 
 
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栭〉闈�
+            function set_ClearBill() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
+                    type: "GET",
+                    data: {},
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].hitemid);
+                    }
+                });
+            }
+            //缂栬緫椤甸潰鍔犺浇
+            function set_EditFromGrid() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Supplier/xg",
+                    //url: "http://localhost:12761/Gy_Supplier/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].HNumber);
+                        $("#HName").val(d.data[0].HName);
+                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        //table.reload(layTableId, {
+                        //    data: ajaxReturnData
+                        //});
+                    }
+
+                });
+            }
+            //杩斿洖楠屾敹
+            function GetHSecManagerValue(obj) {
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            //#endregion
 
         });
         //浠ヤ笂涓簂ayui妯″潡
 
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-
-
-
-
-
     </script>
+  
 
 </body>
 </html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index f7418ea..074dae3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <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">
@@ -9,95 +9,57 @@
     <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>
-    
+
 </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-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</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="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
-                                        </div>
-                                        <div class="layui-col-xs12 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 class="layui-colla-title layui-inline">
+                                    <div class="layui-inline">
+                                        <span></span>
                                     </div>
                                 </div>
-
-                                <div class="layui-row layui-form-item">
-                                    <!--<div class="layui-inline">
-                                    <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
-                                </div>-->
-                                    <!--<div class="" style="padding-top: 10px;">
-                                    <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 class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">瀹㈡埛浠g爜</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                     </div>
-                                </div>-->
                                 </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">瀹㈡埛鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
                             </div>
                         </div>
-                        <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
+
+
+                        <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-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" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" ><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>绂佺敤</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>鍙嶇鐢�</button>
                             </div>
                         </script>
+
                     </form>
+
                 </div>
             </div>
         </div>
@@ -108,126 +70,116 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
         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
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
             var sWhere = "";
-            //#endregion 
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            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: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜' }
-                    , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
+            var option = [];
             //#endregion
 
-            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Customer/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 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btnAdd': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btndelete': set_DeleteBill();
+                        break;
+                    //绂佺敤
+                    case 'btnJY': set_AuditBill();
+                        break;
+                    //鍙嶇鐢�
+                    case 'btnFJY': set_DeAuditBill();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
             //#endregion
 
-            //#region 鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_Department_Delete'
-
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        var checkStatus = table.checkStatus('mainTable');
-                        var layEvent = checkStatus.event;
-                        $.ajax({
-                            url: GetWEBURL() + '/Gy_Customer/Delete_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 1 });
-
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
-                        layer.close(index); //鍏抽棴寮瑰眰
+            //#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: 'radio', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜' }
+                        , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_Customer/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(btnModify)', function (data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '瀹㈡埛鍩虹璧勬枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_Customer_Edit.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
+            }
+            //蹇�熸煡璇㈡寜閽�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -254,14 +206,89 @@
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            // 閲嶇疆鎸夐挳
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            // 鍒犻櫎鎸夐挳
+            function set_DeleteBill() {
+                var ModRightNameDelete = 'Gy_Department_Delete'
 
+                //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
+                //    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
+                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
+                    btn: ['Yes', 'No'] //鎸夐挳
+                    , yes: function (index, layero) {
+                        var checkStatus = table.checkStatus('mainTable');
+                        var layEvent = checkStatus.event;
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Customer/Delete_Json',
+                            type: "GET",
+                            //async: true,
+                            data: { "HItemID": checkStatus.data[0].HItemID, "User": "Admin", "ModRightNameDelete": ModRightNameDelete },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    $("#btnSearch").click();
+                                    layer.msg(result.Message, { icon: 1 });
 
+                                }
+                                else {
+                                    layer.msg(result.Message, { icon: 5 });
+                                }
+                            }
+                        })
+                        layer.close(index); //鍏抽棴寮瑰眰
+                    }
+                });
+            }
+            // 淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀹㈡埛鍩虹璧勬枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['Gy_Customer_Edit.html?OperationType=3&linterid=' + data[0].HItemID + '&HSouceBillType=']
+                    , resize: false
+                })
+            }
+            //鏂板鎸夐挳
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板涓嶈壇鍘熷洜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            }
+            // 绂佺敤鎸夐挳
+            function set_AuditBill() {
+
+            }
+            // 鍙嶇鐢ㄦ寜閽�
+            function set_DeAuditBill() {
+
+            }
+            //#endregion
         });
-        //#endregion 
-        
-
-
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 816306d..a489efc 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -17,39 +17,36 @@
             <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-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
-                                <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
-                                </div>
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-row">
+                        <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">
+                                <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-inline">
                                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                                <div class="layui-input-inline">
+                                                <div class="layui-input-inline" style="margin-right:0px">
                                                     <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
                                                     <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" id="HCreateOrgID-BT">...</button>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                                <div class="layui-input-inline">
+                                                <div class="layui-input-inline" style="margin-right:0px">
                                                     <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
                                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" id="HUseOrgID-BT">...</button>
                                             </div>
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澶囨敞</label>
@@ -58,7 +55,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">瀹㈡埛浠g爜</label>
                                                 <div class="layui-input-inline">
@@ -78,7 +75,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">绠�绉�</label>
                                                 <div class="layui-input-inline">
@@ -98,7 +95,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                                 <div class="layui-input-inline">
@@ -118,7 +115,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">閭紪</label>
                                                 <div class="layui-input-inline">
@@ -138,7 +135,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">寮�鎴烽摱琛�</label>
                                                 <div class="layui-input-inline">
@@ -158,7 +155,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">澧炲�肩◣鐜�</label>
                                                 <div class="layui-input-inline">
@@ -178,7 +175,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
+                                        <div class="layui-form-item">
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">鍥藉</label>
                                                 <div class="layui-input-inline">
@@ -190,7 +187,7 @@
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HAreaID" id="HAreaID" 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;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                     </button>
                                                 </div>
@@ -200,19 +197,19 @@
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HCurID" id="HCurID" 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;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;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-form-item">
                                             <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="HSSName" id="HSSName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HSSID" id="HSSID" 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;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                     </button>
                                                 </div>
@@ -228,7 +225,7 @@
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HCusTypeID" id="HCusTypeID" 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;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                     </button>
                                                 </div>
@@ -236,7 +233,8 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-tab-item ">
+
+                                <div class="layui-tab-content" style="display:none">
                                     <div class="layui-form-item" style="padding-top: 10px;">
                                         <div class="layui-row">
                                             <div class="layui-col-xs3">
@@ -292,12 +290,31 @@
                                         </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>
                             </div>
                         </div>
+                        <!--<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 style="padding: 10px;">
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
+                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+                                </div>
+
+
+                                
+                            </div>
+                        </div>-->
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                     </form>
                 </div>
@@ -310,12 +327,24 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
+        //鑾峰彇鍙傛暟
+        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 () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -326,38 +355,185 @@
                 , laydate = layui.laydate
                 , util = layui.util
             var sWhere = "";
+            //#endregion
 
 
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
             $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
-
-            //鑾峰彇鍙傛暟
-            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;
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
             }
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#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(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缁勭粐'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨浣跨敤缁勭粐
+            form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缁勭粐'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//閫夋嫨鍒涘缓缁勭粐
+                var oMain = JSON.stringify(data.field)
+                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+                var index = layer.load();
+                var ModRightNameAdd = 'Gy_Customer_Edit';
+                var user = sessionStorage["HUserName"];
+                if (AllowLoadData()) {
+                    //缂栬緫鈥斺�斾繚瀛�
+                    if (OperationType == 3) {
+                        $.ajax({
+                            type: "POST",
+                            //url: GetWEBURL() + "/Gy_Customer/AddBill1",
+                            url: "http://localhost:12761/Gy_Customer/AddBill1",
+                            async: true,
+                            data: { "oMain": sBillModeify },
+                            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: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    }
+                    //鏂板鈥斺�斾繚瀛�
+                    else {
+                        $.ajax({
+                            type: "POST",
+                            //url: GetWEBURL() + "/Gy_Customer/AddBill",
+                            url: "http://localhost:12761/Gy_Customer/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(Exit)', function (data) {//
+                if (linterid == null || linterid == 0) {
+                    parent.location.href = "../../../views/index.html"
+                }
+                else {
+                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                    parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                }
+            });
+            ////閲嶇疆
+            //form.on('submit(btnReSearch)', function (data) {
+               
+            //});
+            ////鍒犻櫎
+            //form.on('submit(btndelete)', function (data) {
 
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var HType = params[params[1]];    //鍗曟嵁鐘舵��
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            //})
+            ////淇敼
+            //form.on('submit(btnModify)', function (data) {
+
+            //})
+            ////绂佺敤
+            //form.on('submit(btnJY)', function (data) {
+
+            //})
+            ////鍙嶇鐢�
+            //form.on('submit(btnFJY)', function (data) {
+
+            //})
+            //#endregion
 
 
-
-            if (HType == "Modify") {
+            //#region 姝ら〉闈腑鎵�鏈夌殑鏂规硶
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
+                    type: "GET",
+                    data: {},
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].hitemid);
+                    }
+                });
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
                 $.ajax({
                     url: GetWEBURL() + "/Gy_Customer/xg",
                     //url: "http://localhost:12761/Gy_Customer/xg",
@@ -389,106 +565,12 @@
                         $("#HCusStatus").val(d.data[0].HCusStatus);
                         $("#HRemark").val(d.data[0].HRemark);
                         $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
                     }
 
                 });
             }
-            else {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
-                    type: "GET",
-                    data: {},
-                    success: function (d) {
-                        $("#HInterID").val(d.data[0].hitemid);
-                    }
-                });
-                //Initialization();
-            }
-
-
-            //閫夋嫨楠屾敹
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-                var sMainStr = JSON.stringify(data.field);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '楠屾敹鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            ////閫夋嫨鍒涘缓缁勭粐
-            //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-            //    var sMainStr = JSON.stringify(data.field);
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '缁勭粐'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-
-
-            //鑾峰彇鏈�澶у熀纭�璧勬枡ID
-            $.ajax({
-                url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
-                type: "GET",
-                data: {},
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].hitemid);
-                }
-            });
-
-            //鎵撳嵃Printing
-            form.on("submit(print)", function (data) {
-                layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
-                //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-
-            });
-
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-                $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-            });
-
-            //瀹℃牳
-            form.on('submit(Check)', function () {
-
-            });
-
-
-            //閫�鍑�
-            form.on('submit(Cancel)', function () {
-                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
-                });
-            });
-
-
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
                 var HCreateOrg = $("#HCreateOrg").val();
                 if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
 
@@ -531,92 +613,17 @@
                     return;
 
                 }
-                var ModRightNameAdd = 'Gy_Customer_Edit';
-                var user = sessionStorage["HUserName"];
-
-
-                var oMain = JSON.stringify(data.field)
-                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        //url: GetWEBURL() + "/Gy_Customer/AddBill1",
-                        url: "http://localhost:12761/Gy_Customer/AddBill1",
-                        async: true,
-                        data: { "oMain": sBillModeify },
-                        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: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-                else {
-                    $.ajax({
-                        type: "POST",
-                        //url: GetWEBURL() + "/Gy_Customer/AddBill",
-                        url: "http://localhost:12761/Gy_Customer/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: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-            });
-
-
+            }
+            //杩斿洖楠屾敹
+            function GetHSecManagerValue(obj) {
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            //#endregion
 
         });
         //浠ヤ笂涓簂ayui妯″潡
-
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-
-
-
-
+        
 
     </script>
 
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/Gy_Mould.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/Gy_Mould.html"
index 100b1bb..6c8d4c2 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/Gy_Mould.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/Gy_Mould.html"
@@ -8,6 +8,9 @@
     <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 type="text/css">
+       
+    </style>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     
 </head>
@@ -25,11 +28,11 @@
                                     </div>
                                 </div>
                                 <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">妯″叿缂栧彿</label>
@@ -77,7 +80,8 @@
             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
@@ -87,79 +91,35 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: '閫夋嫨', title: '閫夋嫨', hide: true }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
-                    , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
-                    , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
-                    , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
-                    , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
-                    , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
-                    , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
-                    , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
-                    , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
-                    , { field: 'HMoudType', title: 'HMoudType', hide: true }
-                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: 'HSupID', title: 'HSupID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                    , { field: 'HWhID', title: 'HWhID', hide: true }
-                    , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
-                    , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
-                    , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
-                    , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
-                    , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
-                    , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
-                    , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: 'hsubid', title: 'hsubid', hide: true }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { field: 'hbilltype', title: 'hbilltype', hide: true }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //鍒濆鍖栬〃鏍�
+            set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Mould/list1',
-                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 椤甸潰鎸夐挳鐐规浜嬩欢瑙﹀彂
+
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            //鏂板鎸夐挳
+            form.on('submit(btnAdd)', function (data) {
+                set_AddNew();
+            });
+
+            //淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                set_ShowBill();
+            });
+
+            //鍒犻櫎
+            form.on('submit(btndelete)', function (obj) {
+                set_DeleteBill();
+            });
 
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
@@ -168,57 +128,98 @@
                 $("#btnSearch").click();
             });
 
+            //#endregion
 
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {4
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        var checkStatus = table.checkStatus('mainTable');
-                        var layEvent = checkStatus.event;
-                        $.ajax({
-                            url: GetWEBURL() + '/Gy_Mould_Edit/Delete_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "hmainid": checkStatus.data[0].hmainid },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    layer.msg(result.Message, { icon: 1 });
+            //鍒濆鍖栬〃鏍�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
 
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
+                //鏌ヨ
+                get_Display(sWhere);
+            }
 
-                        layer.close(index); //鍏抽棴寮瑰眰
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid()
+            {
+                option = {
+                    elem: '#mainTable'
+                    //, toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 200
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡', templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
+                        , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
+                        , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                        , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
+                        , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
+                        , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
+                        , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
+                        , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
+                        , { field: 'HWhID', title: 'HWhID', hide: true }
+                        , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                        , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                        , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
+                        , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
+                        , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
+                        , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Mould/list1',
+                    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(btnModify)', function (data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '妯″叿妗f璁剧疆'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_Mould_Edit.html?HInterID=' + data[0].hmainid + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
+            //蹇�熻繃婊�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -227,34 +228,100 @@
                 if (HName) {
                     sWhere += " and 妯″叿鍚嶇О like '%" + HName + "%'";
                 }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Gy_Mould/list1',
-                    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 });
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+          
+            //鏂板
+            function set_AddNew() {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板妯″叿妗f鍒楄〃',
+                    closeBtn: false,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: 'Gy_Mould_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
 
+            //淇敼
+            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: '缂栬緫妯″叿妗f鍒楄〃'
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: 'Gy_Mould_Edit.html.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
+                        }
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
+                } 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() + '/Gy_Mould_Edit/Delete_Json',
+                            data: { "hmainid": 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('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
 
             //浠ヤ笂鏄痩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/Gy_Mould_Edit.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/Gy_Mould_Edit.html"
index 43650dd..21bef0d 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/Gy_Mould_Edit.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/Gy_Mould_Edit.html"
@@ -32,21 +32,8 @@
             <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="btnModify" id="btnModify">
-                            <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="btnDelete" id="btnDelete">
-                            <i class="layui-icon layui-icon-delete 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>
+                        <button type="button" id="btnSave" 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="Exit">閫�鍑�</button>
                     </div>
                     <div class="layui-tab" lay-filter="tab-POStockInBill">
                         <!--<ul class="layui-tab-title" lay-filter="tab-all">
@@ -136,8 +123,9 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲ERP鐗╂枡</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterList" id="btnHMaterList" 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>
@@ -145,8 +133,9 @@
                                         <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="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HMouleTypeName" id="HMouleTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HMouleTypeID" id="HMouleTypeID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMouleList" id="btnHMouleList" 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>
@@ -154,8 +143,9 @@
                                         <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="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HUnitName" id="HUnitName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HUnitID" id="HUnitID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHUnitList" id="btnHUnitList" 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>
@@ -165,20 +155,21 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍑哄巶鏃ユ湡</label>
                                             <div class="layui-input-block" style="margin-left: 120px;">
-                                                <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px;">
+                                                <input type="date" class="layui-input" name="HOutComDate" id="HOutComDate" style="padding-left: 32px; width:185px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;">鍑哄巶缂栧彿</label>
-                                            <div class="layui-input-block" style="margin-left: 120px;">
+                                            <div class="layui-input-block" style="margin-left: 125px;">
                                                 <input type="text" class="layui-input" name="HOutComNo" id="HOutComNo" style="background-color:#efefef4d;">
                                             </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="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                            <div class="layui-input-block" style="margin-left: 80px;">
+                                                <input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HDeptID" id="HDeptID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptList" id="btnHDeptList" 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>
@@ -188,8 +179,9 @@
                                         <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="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSupID" id="HSupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSupList" id="btnHSupList" 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>
@@ -205,8 +197,9 @@
                                         <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="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HWHName" id="HWHName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HWHID" id="HWHID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWHList" id="btnHWHList" 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>
@@ -214,8 +207,9 @@
                                         <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="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HRoutingName" id="HRoutingName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HRoutingID" id="HRoutingID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHRoutingList" id="btnHRoutingList" 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>
@@ -223,8 +217,9 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿BOM</label>
                                             <div class="layui-input-block" style="margin-left: 77px;">
-                                                <input type="text" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HBOMName" id="HBOMName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HBOMID" id="HBOMID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHBOMList" id="btnHBOMList" 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>
@@ -240,8 +235,9 @@
                                         <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="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HSPGroupName" id="HSPGroupName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSPGroupID" id="HSPGroupID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPGroupList" id="btnHSPGroupList" 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>
@@ -249,8 +245,9 @@
                                         <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="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
-                                                <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;">
+                                                <input type="text" class="layui-input" name="HSPName" id="HSPName" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <input type="hidden" class="layui-input" name="HSPID" id="HSPID" style="background-color:#efefef4d;width: 60%;display: inline-block;">
+                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHSPIDList" id="btnHSPIDList" 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>
@@ -299,13 +296,13 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMaker" id="HMaker" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -313,13 +310,13 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -327,19 +324,19 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDater" id="HUpDater" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -347,19 +344,19 @@
                                         <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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" 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="" id="" style="background-color:#efefef4d;" readonly>
+                                                <input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
                                             </div>
                                         </div>
                                     </div>
@@ -367,79 +364,447 @@
                             </div>
                         </div>
                     </div>
-                    <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>
                 </form>
             </div>
         </div>
     </div>
 
-    <script type="text/html" id="barDemo">
-        <!--<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="HSupColor">
-        {{#  if(d.HSupFlag === "true"){ }}
-        <span style="color: white;background-color:#5FB878;">{{ d.HSupFlag }}</span>
-        {{#  } else { }}
-        <span style="color: white;background-color:red;">{{ d.HSupFlag }}</span>
-        {{#  } }}
-    </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/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
-
+        //鑾峰彇椤甸潰璺宠浆鍙傛暟
+        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', '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
                 , util = layui.util
                 ;
+            var sBillType = "3899";
+            //#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_InitFrom();
+
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
+            }
+            else if (OperationType == 3) {//缂栬緫
+
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+             //#endregion
+
+            //#region 椤甸潰鎸夐挳瑙﹀彂浜嬩欢
+            //淇濆瓨
+            form.on('submit(btnSave)', function (data) {//鎻愪氦
+                set_btnSave(data);
+            })
+
+            //妯″叿鍒嗙被
+            form.on('submit(btnHMouleList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '妯″叿鍒嗙被鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_MouldType.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HMouleTypeName").val(checkStatus.data[0].HName);
+                        $("#HMouleTypeID").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(btnHUnitList)', 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);
+                        $("#HUnitID").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(btnHDeptList)', 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(btnHSupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '渚涘簲鍟嗗垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SupplierInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSupName").val(checkStatus.data[0].HName);
+                        $("#HSupID").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(btnHWHList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撳簱鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/WareHouseInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWHName").val(checkStatus.data[0].HName);
+                        $("#HWHID").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(btnHRoutingList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '宸ヨ壓璺嚎鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/RouteInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HRoutingName").val(checkStatus.data[0].HName);
+                        $("#HRoutingID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //BOM
+            form.on('submit(btnHBOMList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: 'BOM鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/BomGroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HBOMName").val(checkStatus.data[0].HName);
+                        $("#HBOMID").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(btnHSPGroupList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撲綅缁勫垪琛�',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/LocationGroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSPGroupName").val(checkStatus.data[0].HName);
+                        $("#HSPGroupID").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(btnHSPIDList)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '浠撲綅鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/WareLocationInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSPName").val(checkStatus.data[0].HName);
+                        $("#HSPID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+
+            //#endregion
+
+
+
+            //鍒濆鍖栬〃鍗曟彃浠�
+            function set_InitFrom() {
+                //甯歌鐢ㄦ硶
+                laydate.render({
+                    elem: '#HDate'
+
+                });
+                laydate.render({
+                    elem: '#HOutComDate'
+                });
             }
 
-
-            //鑾峰彇鍙傛暟
-            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;
+            //鏂板
+            function set_AddFNew() {
+                //鑾峰彇鏈�澶у崟鎹彿
+                get_MAXNum();
             }
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-            var HType = params[params[1]];//鍗曟嵁鐘舵��
 
+            //鑾峰彇鏈�澶у崟鎹彿
+            function get_MAXNum() {
+                $("#HInterID").val("0");
+                $("#HBillNo").val("");
+                $.ajax({
+                    url: GetWEBURL() + "/Web/GetMAXNum",
+                    type: "GET",
+                    data: { "HBillType": sBillType },
+                    success: function (d) {
+                        $("#HInterID").val(0);
+                        $("#HBillNo").val(d.data[0].HBillNo);
+                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                        $("#HOutComDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    }
+                });
+            }
 
-            if (HType == "Modify") {
+            //缂栬緫
+            function set_EditFromGrid()
+            {
+                $("#HInterID").val(linterid);//淇敼鏃朵富琛↖D
                 $.ajax({
                     url: GetWEBURL() + "/Gy_Mould_Edit/xg",
-                    //url: "http://localhost:12761/Gy_Mould_Edit/xg",
                     type: "GET",
                     data: {
                         "HInterID": linterid
@@ -485,375 +850,60 @@
 
                 });
             }
-            else {
+
+            //淇濆瓨
+            function set_btnSave(data) {
+                var sMainStr = JSON.stringify(data.field);
                 $.ajax({
-                    url: GetWEBURL() + "/Web/GetMAXNum",
-                    type: "GET",
-                    data: { "HBillType": '3899' },
-                    success: function (d) {
-                        //console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+                    type: "POST",
+                    url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) {
+                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                if (linterid == undefined) {
+                                    $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+                                }
+                                else {
+                                    var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                    parent.layer.close(index); //鍐嶆墽琛屽叧闂� 
+                                }
+
+                            });
+                        }
+                        else {
+                            layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                        }
+                    },
+                    error: function (err) {
+                        layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                     }
                 });
             }
 
-
-            //淇濆瓨鎻愪氦
-            form.on('submit(btnSave)', function (data) {//鎻愪氦
-                //var tableData = data.field;
-                var sMainStr = JSON.stringify(data.field);
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill1",
-                        async: true,
-                        data: { "oMain": sMainStr },
-                        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(Exit)', function () {
+                if (linterid = "undefined") {
+                    Pub_Close(2);
                 }
                 else {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Mould_Edit/AddBill",
-                        async: true,
-                        data: { "oMain": sMainStr },
-                        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: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    Pub_Close(1);
                 }
-            });
-
-
-
-            
-
-
-            function RoadBillMain(linterid)//鍔犺浇琛ㄥご
-            {
-                $.ajax({
-                    url: GetWEBURL() + "/Web/GetPonderationBill",
-                    type: "GET",
-                    data: { "HInterID": linterid },
-                    success: function (d) {
-                        // console.log(d.data);
-                        $("#HInterID").val(d.data[0].HInterID);
-                        $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
-
-                    }
-                })
-            }
-
-
-
-
-            //閫夋嫨涓嶈壇鍘熷洜
-            form.on('submit(HBadReasonID-BT)', function () {//閫夋嫨浠撳簱
-                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
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨宸ュ簭璁″垝鍗�
-            form.on('submit(HPlanID-BT)', function () {//閫夋嫨宸ュ簭璁″垝鍗�
-                layer.open({
-                    type: 2
-                    , area: ['80%', '80%']
-                    , title: '宸ュ簭璁″垝鍗曞垪琛�'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ProcessPlanViewList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            //閫夋嫨璐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");
-                    }
-                })
-            });
-
-            //閫夋嫨鐢宠宸ュ簭
-            form.on('submit(HSQProcID-BT)', function () {//閫夋嫨鐢宠宸ュ簭
-                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
-                    , 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(cmdModify)', function () {//缂栬緫
-                var sSubStr = table.cache['wl-table'];
-                //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '鏄庣粏鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-                // }
-            });
-
-            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;
-                $.ajax(
-                    {
-                        type: "POST",
-                        url: GetWEBURL() + "SaveBadReasonList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                        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 });
-
-            }
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            //if (sessionStorage.login != "login") {
+            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+            //    }, function () { window.location.href = "../../user/login.html"; });
+            //}
 
         });
-        //瀹氫箟鍏ㄥ眬鍙橀噺
-        var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID, ZRProcName, QRName
-            ;
-        function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
-        {
-            HReasonName = obj[0].HName;
-            ReasonID = obj[0].HItemID;
-        }
-        function GetHPlanValue(obj) {  //杩斿洖宸ュ簭璁″垝鍗�
-            $("#HMainSourceInterID").val(obj[0].hmainid);
-            $("#HMainSourceEntryID").val(obj[0].hsubid);
-            $("#HMainSourceBillNo").val(obj[0].鍗曟嵁鍙�);
-            $("#HMaterID").val(obj[0].HMaterID);
-            $("#HMaterNumber").val(obj[0].鐗╂枡浠g爜);
-            $("#HMater").val(obj[0].鐗╂枡鍚嶇О);
-            $("#HCenterID").val(obj[0].HCenterID);
-            $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績);
-            $("#HModel").val(obj[0].瑙勬牸鍨嬪彿);
-            $("#HPlanQty").val(obj[0].璁″垝鏁伴噺);
-
-
-        }
-        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/\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 836375e..8c9906f 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"
@@ -1038,8 +1038,6 @@
 
         //#region 鏁版嵁楠岃瘉
         function AllowLoadData(sSubStr) {
-           
-
             if ($("#HMouldCode").val() == '') {
                 layer.msg("鎴愬搧妯″叿娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                 return false;
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 4cda1c6..c6364c9 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"
@@ -71,7 +71,6 @@
                                                     </button>
                                                 </div>
                                             </div>
-
                                         </div>
                                         <div class="layui-form-item">
                                             <div class="layui-inline">
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
index ba09076..6b886df 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillEdit.html"
@@ -166,7 +166,7 @@
 
             var option=[];
             var sBillType = "3903";
-            var TabRow = { /*"HDotCheckID": 0, "HDotCheckCode": "",*/"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
+            var TabRow = { "HDotCheckItemID": 0,"HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" };
 
             //#endregion
 
@@ -312,9 +312,8 @@
                 columns = [
                     { type: 'checkbox', fixed: 'left' }
                     , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
-                    //, { field: 'HDotCheckID', title: '鐐规椤圭洰浠g爜', edit: 'text', hide: true }
-                    //, { field: 'HDotCheckCode', title: '鐐规椤圭洰浠g爜', edit: 'text', event: "HDotCheckCode" }
-                    , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: "" }
+                    , { field: 'HDotCheckItemID', title: '鐐规椤圭洰', edit: 'text', hide: true }
+                    , { field: 'HDotCheckItem', title: '鐐规椤圭洰', edit: 'text', event: 'HDotCheckItem'}
                     , { field: 'HDotCheckPart', title: '鐐规閮ㄤ綅', edit: 'text', event: "" }
                     , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text' }
                     , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text', hide: true }
@@ -383,42 +382,41 @@
             function set_GridCellCheck(obj) {
                 $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                     if (event.key == "F7") {
-                        //if (obj.event === 'HDotCheckCode')  //鐐规椤圭洰浠g爜
-                        //{
-                        //    //椤甸潰灞�-鑷畾涔�
-                        //    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({
-                        //                HDotCheckID: checkStatus.data[0].HItemID,
-                        //                HDotCheckCode: checkStatus.data[0].HNumber,
-                        //                HDotCheckItem: checkStatus.data[0].HName
-                        //            });
-                        //            layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
-                        //        }
-                        //        , btn2: function (index, layero) {
-                        //            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                        //        },
-                        //        end: function () {
-                        //        }
-                        //    });
-                        //}
+                        if (obj.event === 'HDotCheckItem')  //鐐规椤圭洰
+                        {
+                            //椤甸潰灞�-鑷畾涔�
+                            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({
+                                        HDotCheckItemID: checkStatus.data[0].HItemID,
+                                        HDotCheckItem: checkStatus.data[0].HName
+                                    });
+                                    layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                                }
+                                , btn2: function (index, layero) {
+                                    //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                                    //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                                },
+                                end: function () {
+                                }
+                            });
+                        }
                         if (obj.event === 'HManagerCode')  //璐熻矗浜轰唬鐮�
                         {
                             //椤甸潰灞�-鑷畾涔�
@@ -575,10 +573,7 @@
                 if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
                     sSubStr = JSON.parse(sSubStr);
                     for (var i = 0; i < sSubStr.length; i++) {
-                        //if (sSubStr[i].HDotCheckCode == "") {
-                        //    layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        //    return false;
-                        //}
+                       
                         if (sSubStr[i].HDotCheckItem == "") {
                             layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐐规椤圭洰浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;

--
Gitblit v1.9.1