From 123cca6352b0362de866eb142187c2c8cbf7885b Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 20 八月 2021 15:21:03 +0800
Subject: [PATCH] 基础资料整理,过滤条件完善,新增编辑功能。

---
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html           |  171 +
 WebTM/WebTM.csproj.user                             |    2 
 WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html      |  322 +++
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html     |    2 
 WebTM/views/基础资料/生产基础资料/Gy_Process.html             |  233 +-
 WebTM/views/基础资料/公用基础资料/Gy_EquipMent.html           |   31 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html        |   99 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html |  439 +++++
 WebTM/views/基础资料/公用基础资料/Gy_Material.html            |  138 +
 WebTM/views/基础资料/工资基础资料/Gy_Group.html               |  553 ++----
 /dev/null                                           |  489 ------
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html            |   28 
 WebTM/views/基础资料/公用基础资料/Gy_PropertyList.html        |   17 
 WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html      |  434 +++++
 WebTM/views/index.html                              |    5 
 WebTM/views/基础资料/公用基础资料/Gy_StockPlace.html          |   17 
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html    |  555 ++++++
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html            |  145 -
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html  |  652 ++++++++
 WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_BadReason.html  |    1 
 WebTM/WebTM.csproj                                  |    8 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html          |  488 ++---
 22 files changed, 3,306 insertions(+), 1,523 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index abe926a..9c938fd 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -106,6 +106,8 @@
     <Content Include="views\grf\b1.grf" />
     <Content Include="views\grf\b.grf" />
     <Content Include="views\ReportHtml.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\grf\b.grf" />
     <None Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -503,6 +505,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Currency.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Employee.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Unit.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_EmployeeList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CheckItem.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_QCCheckClass.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse_Edit.html" />
@@ -511,6 +514,9 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Currency.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Material.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_DepartmentList.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_Group_Add_Edit.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Process.html" />
     <Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_WorkCenter.html" />
@@ -522,8 +528,6 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Unit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Warehouse.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_Department_Edit.aspx" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Add_Edit_Gy_Group.html" />
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..18883ed 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Git\qianduan\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
     <ProjectView>ShowAllFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 99e2737..4837c18 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -660,8 +660,9 @@
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html">鐗╂枡鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html">浠撳簱鍒楄〃</a></dd>
                                         <dd><a lay-href="">浠撲綅鍒楄〃null</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Employee.html">鑱屽憳鍒楄〃</a></dd>
-                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">閮ㄩ棬鍒楄〃</a></dd>
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html">鑱屽憳鍒楄〃</a></dd>
+                                        <!--<dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Department.html">閮ㄩ棬鍒楄〃old</a></dd>-->
+                                        <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html">閮ㄩ棬鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PropertyList.html">杈呭姪灞炴�у垪琛�</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Xt_ORGANIZATIONSList.html">缁勭粐鍒楄〃</a></dd>
                                         <dd><a lay-href="鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html">璁¢噺鍗曚綅鍒楄〃</a></dd>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Currency.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_Currency.html"
index 4449762..f835bcd 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_Currency.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_Currency.html"
@@ -113,6 +113,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -124,8 +125,9 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            //#endregion
 
-
+            //#region 鍒濆鍖栬〃鏍�
             $.ajax({
                 url: GetWEBURL() + '/Gy_Currency/LoadTree',
                 type: "GET",
@@ -144,40 +146,6 @@
                     });
                 }
             });
-
-            //$.ajax({
-            //    type: "get",
-            //    url: GetWEBURL() + '/Gy_Department/LoadTree',
-            //    async: true,
-            //    success: function (result) {
-            //        //  console.log(result.data);
-            //        var tree = Customerdatatree('treeDepartment', result.data, true);
-            //        tree.onspread = function () {
-            //            var obj = this;
-            //            //妯℃嫙post鍚庡彴鏁版嵁锛屽欢杩�2绉�
-            //            setTimeout(() => {
-            //                var data = getTreeJson(obj.data.HParentID); //寮傛鑾峰彇鏁版嵁
-            //                obj.lazytree(data);
-            //            }, 2000);
-            //        }
-            //        tree.onclick = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.state); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //            console.log(obj.data.children); //褰撳墠鑺傜偣涓嬫槸鍚︽湁瀛愯妭鐐�
-            //        }
-            //        tree.oncheck = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.checked); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //        }
-            //    }
-            //});
-
-
-
             var option = {
                 elem: '#mainTable'
                 , toolbar: '#toolbarDemo'
@@ -198,7 +166,9 @@
             };
 
             var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
                 url: GetWEBURL() + '/Gy_Currency/list1',
                 type: "GET",
@@ -217,8 +187,9 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+            //#endregion
 
-            //澶村伐鍏锋爮浜嬩欢
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
@@ -287,28 +258,18 @@
                         break;
                 };
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
+            //#endregion
 
-            //鍒犻櫎
+            //#region 鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
-                //var checkStatus = table.checkStatus('mainTable')
-                //    , data = checkStatus.data;
-                ////console.log(checkStatus.data[0].HBillStatus);
-                //if (data.length == 0) {
-                //    layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
-                //    return;
-                //}
-                //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
-                //    layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
-                //    return;
-                //}
-
                 var ModRightNameDelete = 'Gy_Department_Delete'
 
                 var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
@@ -334,36 +295,13 @@
                                 }
                             }
                         })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
-
                         layer.close(index); //鍏抽棴寮瑰眰
                     }
                 });
             });
+            //#endregion
 
-
-
-
-            //绂佺敤
+            //#region 绂佺敤
             form.on('submit(btnJY)', function (obj) {
                 //var checkStatus = table.checkStatus('mainTable')
                 //    , data = checkStatus.data;
@@ -399,33 +337,16 @@
                                 }
                             }
                         })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
+                        
+                        
 
                         layer.close(index); //鍏抽棴寮瑰眰
                     }
                 });
             });
+            //#endregion
 
-            //鍙嶇鐢�
+            //#region 鍙嶇鐢�
             form.on('submit(btnFJY)', function (obj) {
                 //var checkStatus = table.checkStatus('mainTable')
                 //    , data = checkStatus.data;
@@ -461,33 +382,13 @@
                                 }
                             }
                         })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
-
                         layer.close(index); //鍏抽棴寮瑰眰
                     }
                 });
             });
+            //#endregion 
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -516,9 +417,9 @@
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
+            //#endregion
 
-
-            //淇敼鎸夐挳
+            //#region 淇敼鎸夐挳
             form.on('submit(btnModify)', function (data) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -533,7 +434,7 @@
                     , resize: false
                 })
             });
-
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
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_Department.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_Department.html"
deleted file mode 100644
index 14344d5..0000000
--- "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_Department.html"
+++ /dev/null
@@ -1,489 +0,0 @@
-锘�<!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>
-
-</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-xs9 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">閮ㄩ棬浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HName" id="HName">
-                                                    </div>
-                                                </div>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <div 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>
-                                    </div>-->
-                                </div>
-                            </div>
-                        </div>
-                        <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
-                        <script type="text/html" id="toolbarDemo">
-                            <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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>-->
-
-                            </div>
-                        </script>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <script>
-        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 = "";
-
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_Department/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    var treeData = LoadTree(data);
-                    tree.render({
-                        elem: '#treeDepartment',
-                        data: treeData,
-                        id: 'treeId',
-                        disabled:'disabled',
-                        showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-                        showLine:false
-                    });
-                }
-            });
-
-            //$.ajax({
-            //    type: "get",
-            //    url: GetWEBURL() + '/Gy_Department/LoadTree',
-            //    async: true,
-            //    success: function (result) {
-            //        //  console.log(result.data);
-            //        var tree = Customerdatatree('treeDepartment', result.data, true);
-            //        tree.onspread = function () {
-            //            var obj = this;
-            //            //妯℃嫙post鍚庡彴鏁版嵁锛屽欢杩�2绉�
-            //            setTimeout(() => {
-            //                var data = getTreeJson(obj.data.HParentID); //寮傛鑾峰彇鏁版嵁
-            //                obj.lazytree(data);
-            //            }, 2000);
-            //        }
-            //        tree.onclick = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.state); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //            console.log(obj.data.children); //褰撳墠鑺傜偣涓嬫槸鍚︽湁瀛愯妭鐐�
-            //        }
-            //        tree.oncheck = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.checked); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //        }
-            //    }
-            //});
-
-
-
-            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: '浣跨敤鏍囪' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Department/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 });
-                }
-            });
-
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
-            });
-
-            //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                //var checkStatus = table.checkStatus('mainTable')
-                //    , data = checkStatus.data;
-                ////console.log(checkStatus.data[0].HBillStatus);
-                //if (data.length == 0) {
-                //    layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
-                //    return;
-                //}
-                //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
-                //    layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
-                //    return;
-                //}
-
-                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_Department/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 });
-                                }
-                            }
-                        })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
-
-                        layer.close(index); //鍏抽棴寮瑰眰
-                    }
-                });
-            });
-
-
-
-
-            //绂佺敤
-            form.on('submit(btnJY)', function (obj) {
-                //var checkStatus = table.checkStatus('mainTable')
-                //    , data = checkStatus.data;
-                ////console.log(checkStatus.data[0].HBillStatus);
-                //if (data.length == 0) {
-                //    layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
-                //    return;
-                //}
-                //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
-                //    layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
-                //    return;
-                //}
-                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_Department/JY_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "HItemID": checkStatus.data[0].HItemID },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 1 });
-
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
-
-                        layer.close(index); //鍏抽棴寮瑰眰
-                    }
-                });
-            });
-
-            //鍙嶇鐢�
-            form.on('submit(btnFJY)', function (obj) {
-                //var checkStatus = table.checkStatus('mainTable')
-                //    , data = checkStatus.data;
-                ////console.log(checkStatus.data[0].HBillStatus);
-                //if (data.length == 0) {
-                //    layer.msg("鍏堥�夋嫨瑕佸垹闄よ鍗曟嵁鍚楋紵");
-                //    return;
-                //}
-                //if (checkStatus.data[0].HBillStatus == '宸插鏍�') {
-                //    layer.msg("璇ュ崟鎹凡瀹℃牳鏃犳硶鍒犻櫎锛岃鍏堝弽瀹℃牳锛�");
-                //    return;
-                //}
-                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_Department/FJY_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "HItemID": checkStatus.data[0].HItemID },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 1 });
-
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
-
-                        //$.ajax({
-                        //    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                        //    url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
-                        //    type: "GET",
-                        //    data: { "sWhere": sWhere },
-                        //    success: function (data1) {
-                        //        if (data1.count == 1) {
-                        //            option.data = data1.data;
-                        //            table.render(option);
-                        //            layer.close(index0);
-                        //        } else {
-                        //            layer.close(index0);
-                        //            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        //        }
-                        //    }, error: function () {
-                        //        layer.close(index0);
-                        //        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                        //    }
-                        //});
-
-                        layer.close(index); //鍏抽棴寮瑰眰
-                    }
-                });
-            });
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 閮ㄩ棬浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_Department/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                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_Department_Edit.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
-        });
-
-
-
-
-    </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_DepartmentList.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_DepartmentList.html"
new file mode 100644
index 0000000..0b9af58
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -0,0 +1,322 @@
+锘�<!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/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>
+
+</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-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 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>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+                               <!-- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>-->
+                            </div>
+                        </script>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        layui.config({
+            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+        }).extend({
+            index: 'lib/index', //涓诲叆鍙fā鍧�
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+        //#region 鍏敤鍙橀噺
+            var $ = layui.$
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+            var option = [];
+
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //鏂板
+                    case 'set_AddNew': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //娴忚
+                    case 'get_PrintReport': get_PrintReport();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                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: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Department/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (result) {
+                        if (result.count == 1) {
+                            option.data = result.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '閮ㄩ棬鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 娴忚
+            function get_PrintReport() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鐢熶骇璧勬簮-娴忚'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹祻瑙堬紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    var ajaxLoad = layer.load();
+                    //閫昏緫鍒犻櫎鏂规硶
+                    $.ajax({
+                        url: GetWEBURL() + 'DeltetGy_Source',
+                        type: "GET",
+                        data: { "HItemID": ItemID },
+                        success: function (result) {
+                            if (result.count == 1) {
+                                layer.msg(result.Message, { icon: 1 });
+                                get_Display(sWhere);
+                                layer.close(ajaxLoad);
+                            } else {
+                                layer.close(ajaxLoad);
+                                layer.alert(result.Message, { icon: 5 });
+                            }
+                        }, error: function () {
+                            layer.close(ajaxLoad);
+                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                        }
+                    });
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 閮ㄩ棬浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 閮ㄩ棬鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
+            }
+            //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '鐢熶骇璧勬簮-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+        
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+        //#endregion
+
+
+
+    </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_Employee.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
similarity index 83%
rename from "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_Employee.html"
rename to "WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index f3167c1..0f2d2df 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_Employee.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -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,7 +9,10 @@
     <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/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <!--<script src="../../../layuiadmin/layui/zgqlayui.js"></script>-->
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -46,30 +49,29 @@
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
                 </div>
             </div>
         </div>
-    </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    </div>x
     <script>
+
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+        //#region 鍏敤鍙橀噺
             var $ = layui.$
             , admin = layui.admin
             , layer = layui.layer
@@ -79,15 +81,22 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
-            //鍏敤鍙橀噺 
             var option = [];
+        //#endregion
 
-            //鍒濆鍖栬〃鏍�
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+           //鍒濆鍖栬〃鏍�
             set_InitGrid();
-            //鍔犺浇鏁版嵁鍒扮綉鏍�
-            get_Display(sWhere); 
 
-            //澶村伐鍏锋爮浜嬩欢
+           //鍔犺浇鏁版嵁鍒扮綉鏍�
+            get_Display(sWhere);
+
+        //#endregion
+
+        //#region 鏈〉闈㈣皟鐢ㄧ殑鎵�鏈夋柟娉�
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+         //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
@@ -119,26 +128,30 @@
                         break;
                 };
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+         //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
             });
 
+         //#endregion
 
-
-            //閲嶇疆杩囨护鏉′欢
+         //#region 閲嶇疆杩囨护鏉′欢
             function set_ClearQuery() {
                 $("#HNumber").val("");
                 $("#HName").val("");
             }
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+         //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 get_FastQuery(table, option);
             });
+            //#endregion
 
-            //蹇�熻繃婊�
+          
+         //#region 蹇�熻繃婊�
             function get_FastQuery(table, option) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -152,8 +165,11 @@
                 get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
-             
-            //鍒濆鍖栬〃鏍�
+             //#endregion
+
+            //#endregion
+
+        //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
                 //鍒濆鍖栫綉鏍�
                option = {
@@ -180,8 +196,9 @@
                     ]]
                 };
             }
+          //#endregion
 
-            //鍔犺浇缃戞牸
+           //#region 鍔犺浇缃戠粶
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
                 //鍔犺浇鏁版嵁鍒扮綉鏍�
@@ -206,8 +223,9 @@
                 }); 
             }
 
+            //#endregion
 
-            //鏂板
+            //#region 鏂板
             function set_AddNew() {
                 layer.open({
                     type: 2,
@@ -227,13 +245,14 @@
                     }
                 });
             }
+            //#endregion
 
-            //缂栬緫鍗曟嵁
+            //#region 缂栬緫鍗曟嵁
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var hID = data[0].HItemID.toString();
+                    var linterid = data[0].HItemID.toString();
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({
                         type: 2
@@ -242,7 +261,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , resize: false
                         , cancel: function () {
                             //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -253,8 +272,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 } 
             }
+            //#endregion
 
-            //鍒犻櫎
+            //#region 鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -295,16 +315,19 @@
                 }
             }
 
+            //#endregion
 
-            //瀹℃牳
+            //#region 瀹℃牳
             function set_CheckBill() {
             }
+            //#endregion
 
-            //鍙嶅鏍�
+            //#region 鍙嶅鏍�
             function set_AbandonCheck() {
             }
+            //#endregion 
 
-            //棰勮
+            //#region 棰勮
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -318,10 +341,10 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
+        //#endregion
         
 
 
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_Employee_Add_Edit_.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_Employee_Add_Edit_.html"
new file mode 100644
index 0000000..588dff0
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Employee_Add_Edit_.html"
@@ -0,0 +1,652 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鐢熶骇璧勬簮</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鑱屽憳浠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 layui-inline">
+                                <label class="layui-form-label">鑱屽姟</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HDutyName" id="HDutyName" readonly="readonly" autocomplete="off">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-BT">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <input id="HDutyID" name="HDutyID" type="hidden" />
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鑱屽憳鍚嶇О</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HName" id="HName" autocomplete="off">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鎬у埆</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HSex" id="HSex" lay-verify="HSex">
+                                                <option value="鐢�">鐢�</option>
+                                                <option value="濂�">濂�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍑虹敓骞存湀</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBirthDay" id="HBirthDay" lay-verify="HBirthDay" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">骞撮緞</label>
+                                <div class="layui-input-inline">
+                                    <input type="text"name="HAge" lay-verify="HAge" id="HAge">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">绫嶈疮</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBlighty" lay-verify="HBlighty" id="HBlighty" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">姘戞棌</label>
+                                <div class="layui-input-inline">
+                                    <input type="text"  name="HNation" lay-verify="HNation" id="HNation" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鎴风睄绫诲埆:</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HBlightyType" id="HBlightyType" lay-verify="HBlightyType">
+                                                <option value="鏈湴">鏈湴</option>
+                                                <option value="澶栧湴">澶栧湴</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏀挎不闈㈣矊</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HGovStatus" id="HGovStatus" lay-verify="HGovStatus">
+                                                <option value="缇や紬">缇や紬</option>
+                                                <option value="鍥㈠憳">鍥㈠憳</option>
+                                                <option value="鍏氬憳">鍏氬憳</option>
+                                                <option value="鍏朵粬鍏氭淳">鍏朵粬鍏氭淳</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">瀛﹀巻:</label>
+                                <div class="layui-input-inline">
+
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HKnowLev" id="HKnowLev" lay-verify="HKnowLev">
+                                                <option value="灏忓">灏忓</option>
+                                                <option value="鍒濅腑">鍒濅腑</option>
+                                                <option value="楂樹腑">楂樹腑</option>
+                                                <option value="澶т笓">澶т笓</option>
+                                                <option value="鏈">鏈</option>
+                                                <option value="鐮旂┒鐢�">鐮旂┒鐢�</option>
+                                                <option value="纭曞+">纭曞+</option>
+                                                <option value="鍗氬+">鍗氬+</option>
+                                                <option value="鍗氬+鍚�">鍗氬+鍚�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">濠氬Щ鐘跺喌锛�</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HMarr" id="HMarr" lay-verify="HMarr">
+                                                <option value="鏈">鏈</option>
+                                                <option value="宸插">宸插</option>
+                                                <option value="绂诲紓">绂诲紓</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">妗f缂栧彿:</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HArchivesNo" lay-verify="HArchivesNo" id="HArchivesNo" autocomplete="off">
+
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鑱岀О:</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HProTitleID" lay-verify="HProTitleID" id="HProTitleID" autocomplete="off">
+
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">钖祫绛夌骇锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HBirthDay" id="HBirthDay" lay-verify="HBirthDay" autocomplete="off" class="layui-input">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍑虹敓骞存湀</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HSalaryLev" lay-verify="HSalaryLev" id="HSalaryLev" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">姣曚笟瀛︽牎锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HGradSchool" lay-verify="HGradSchool" id="HGradSchool" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">姣曚笟鏃堕棿锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HGradDate" lay-verify="HGradDate" id="HGradDate" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">瀹胯垗锛�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HDormName" lay-verify="HDormName" readonly="readonly" id="HDormName" autocomplete="off">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
+                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                    </button>
+                                    <input id="HDormID" name="HDormID" type="hidden" />
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">澶栬姘村钩锛�</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HEngLev" id="HEngLev" lay-verify="HEngLev">
+                                                <option value="鏃�">鏃�</option>
+                                                <option value="涓�鑸�">涓�鑸�</option>
+                                                <option value="鐔熸倝">鐔熸倝</option>
+                                                <option value="绮鹃��">绮鹃��</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">璁$畻鏈烘按骞筹細</label>
+                                <div class="layui-input-inline">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HCompLev" id="HCompLev" lay-verify="HCompLev">
+                                                <option value="鏃�">鏃�</option>
+                                                <option value="涓�鑸�">涓�鑸�</option>
+                                                <option value="鐔熸倝">鐔熸倝</option>
+                                                <option value="绮鹃��">绮鹃��</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">涓撲笟锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HSpec" lay-verify="HSpec" id="HSpec" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐜颁綇鍦板潃锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HNowAdd" lay-verify="HNowAdd" id="HNowAdd" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐢靛瓙閭锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HEmail" lay-verify="HEmail" id="HEmail" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">瀹跺涵鍦板潃锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HHomeAdd" lay-verify="HHomeAdd" id="HHomeAdd" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閭斂缂栫爜锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HPostalCode" lay-verify="HPostalCode" id="HPostalCode" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍘熷叕鍙革細</label>
+                                <div class="layui-input-inline">
+                                    <input type="text"  name="HOldCompany" lay-verify="HOldCompany" id="HOldCompany" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鑱旂郴鐢佃瘽锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HLinkPhone" lay-verify="HLinkPhone" id="HLinkPhone" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閭斂缂栫爜锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HPostalCode" lay-verify="HPostalCode" id="HPostalCode" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閭斂缂栫爜锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HPostalCode" lay-verify="HPostalCode" id="HPostalCode" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閭斂缂栫爜锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HPostalCode" lay-verify="HPostalCode" id="HPostalCode" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閭斂缂栫爜锛�</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HPostalCode" lay-verify="HPostalCode" id="HPostalCode" autocomplete="off">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <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" title="鏄惁绂佺敤">
+                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs8 layui-inline">
+                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        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
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            //閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(HProc-BT)', function () {
+                get_checkProc();
+            });
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(HWorkingProcedure-BT)', function () {
+                get_checkWorkCenter();
+            });
+
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(ProductionTeam-BT)', function () {
+                get_checkGroup();
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid){
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "GetGy_SourceDetail",
+                    type: "GET",
+                    data: {
+                        "HID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data.h_v_Edit_IF_SourceList[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("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爜
+                                , "HWorkTimes": data.鍗曠彮宸ユ椂
+                                , "HMaxWorkTimes": data.鍗曠彮鏈�澶у伐鏃�
+                                , "HRelationID": data.鍏宠仈ID
+                                , "HMinAdd": data.鏈�灏忚繘闃�
+                                , "HClassCount": data.姣忔棩鐝
+                                , "HOverTimes": data.鍔犵彮宸ユ椂
+                                , "HCenter": data.宸ヤ綔涓績
+                                , "HCenterID": data.宸ヤ綔涓績ID
+                                , "HGroup": data.鐝粍鍚嶇О
+                                , "HGroupID": data.鐝粍ID
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О
+                                , "HDeptID": data.閮ㄩ棬ID
+                                , "HProcName": data.宸ュ簭
+                                , "HProcID": data.宸ュ簭ID
+                                , "HProcNumber": data.宸ュ簭浠g爜
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HType": data.绫诲瀷
+                                , "HRemark": data.澶囨敞
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "SaveGy_SourceList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "msg": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ュ簭鏂规硶
+            function get_checkProc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ヤ綔涓績鏂规硶
+            function get_checkWorkCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EquipMent.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_EquipMent.html"
index 6434cea..b0e3552 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_EquipMent.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_EquipMent.html"
@@ -85,6 +85,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -97,7 +98,9 @@
                 , tree = layui.tree
             var sWhere = "";
 
+            //#endregion
 
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
             $.ajax({
                 url: GetWEBURL() + '/Gy_EquipMent/LoadTree',
                 type: "GET",
@@ -139,7 +142,9 @@
             };
 
             var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
                 url: GetWEBURL() + '/Gy_EquipMent/list',
                 type: "GET",
@@ -158,15 +163,17 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
+            //#endregion
 
-            //鍒犻櫎
+            //#region 鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
 
                 var ModRightNameDelete = 'Gy_EquipMent_Delete'
@@ -201,11 +208,9 @@
                     }
                 });
             });
+            //#endregion
 
-
-
-
-            //绂佺敤
+            //#region 绂佺敤
             form.on('submit(btnJY)', function (obj) {
                 var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
                     , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
@@ -235,8 +240,9 @@
                     }
                 });
             });
+            //#endregion
 
-            //鍙嶇鐢�
+            //#region 鍙嶇鐢�
             form.on('submit(btnFJY)', function (obj) {
                 var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
                     , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
@@ -267,8 +273,9 @@
                     }
                 });
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -297,9 +304,9 @@
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
+            //#endregion
 
-
-            //淇敼鎸夐挳
+            //#region 淇敼鎸夐挳
             form.on('submit(btnModify)', function (data) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -314,7 +321,7 @@
                     , resize: false
                 })
             });
-
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
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_Material.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_Material.html"
index 1484f4e..a4d3536 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_Material.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_Material.html"
@@ -59,11 +59,11 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>-->
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>-->
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>閫�鍑�</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Print" id="btn-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
                             </div>
                         </script>
                     </form>
@@ -80,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
@@ -90,14 +91,20 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
-            //鍏敤鍙橀噺 
+          
             var option = [];
-            //鍒濆鍖栬〃鏍�
-            set_InitGrid();
-            //鍔犺浇鏁版嵁鍒扮綉鏍�
-            get_Display(sWhere);
+            //#endregion
 
-            //澶村伐鍏锋爮浜嬩欢
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+
+             //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
                 var checkStatus = table.checkStatus(obj.config.id);
                 switch (obj.event) {
@@ -129,34 +136,38 @@
                         break;
                 };
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option);
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HModel").val("");
+                $("#HOrgName").val("");
+                //$("#btnSearch").click();
             });
-            //蹇�熻繃婊�
-            function get_FastQuery(table, option) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                var HModel = $("#HModel").val();
-                var HOrgName = $("#HOrgName").val();
-                if (HNumber) {
-                    sWhere += " and 鑱屽憳浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 鑱屽憳鍚嶇О like '%" + HName + "%'";
-                }
-                if (HModel) {
-                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
-                }
-                if (HOrgName) {
-                    sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
-                }
-                var index = layer.load(0);
-                get_Display(sWhere);
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            }
+            //#endregion
 
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+         //#endregion
+
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
@@ -184,11 +195,11 @@
                     ]]
                 };
             }
+            //#endregion
 
-            //鍔犺浇缃戞牸
+            //#region 鏌ヨ
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
-                //鍔犺浇鏁版嵁鍒扮綉鏍�
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Material/list',
@@ -209,17 +220,32 @@
                     }
                 });
             }
+            //#endregion
 
-            //閲嶇疆鎸夐挳
-            form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#HModel").val("");
-                $("#HOrgName").val("");
-                $("#btnSearch").click();
-            });
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                var HModel = $("#HModel").val();
+                var HOrgName = $("#HOrgName").val();
+                if (HNumber) {
+                    sWhere += " and 鐗╂枡浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+                }
+                if (HModel) {
+                    sWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+                }
+                if (HOrgName) {
+                    sWhere += " and 缁勭粐鍚嶇О like '%" + HOrgName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
 
-            //鍒犻櫎
+            //#region 鍒犻櫎
             function set_DeleteBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -227,7 +253,7 @@
                     var ItemID = data[0].HItemID.toString();
                     layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
                         var wait = layer.load();
-                        //閫昏緫鍒犻櫎鏂规硶
+                        //#region 閫昏緫鍒犻櫎鏂规硶
                         $.ajax({
                             url: GetWEBURL() + 'Gy_Material/Delete',
                             type: "GET",
@@ -259,9 +285,10 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
                 }
             }
+            //#endregion
+            //#endregion
 
-
-            //鏂板
+            //#region 鏂板
             function set_AddNew() {
                 layer.open({
                     type: 2,
@@ -281,8 +308,9 @@
                     }
                 });
             }
+            //#endregion
 
-            //缂栬緫鍗曟嵁
+            //#region 缂栬緫鍗曟嵁
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -307,9 +335,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
             }
+            //#endregion
 
-
-            //棰勮
+            //#region 棰勮
             function get_PrintReport() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -323,9 +351,9 @@
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
                 }
             }
-
+            //#endregion
         });
-
+        //#endregion
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PropertyList.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_PropertyList.html"
index 9109f52..df51c4f 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_PropertyList.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_PropertyList.html"
@@ -70,7 +70,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
@@ -80,7 +81,9 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
+            //#endregion
 
+            //#region 鍒濆鍖栬〃鏍�
             var option = {
                 elem: '#mainTable'
                 //, toolbar: '#toolbarDemo'
@@ -100,7 +103,9 @@
             };
 
             var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Gy_Property/list',
@@ -120,15 +125,17 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             }); 
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -157,7 +164,7 @@
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
-
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
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_StockPlace.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_StockPlace.html"
index caaa9aa..fc54c1d 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_StockPlace.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_StockPlace.html"
@@ -83,6 +83,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -94,9 +95,9 @@
                 , util = layui.util
                 , tree = layui.tree
             var sWhere = "";
+            //#endregion
 
-
-
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
             $.ajax({
                 url: GetWEBURL() + '/Gy_StockPlace/LoadTree',
                 type: "GET",
@@ -137,7 +138,9 @@
             };
 
             var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Gy_StockPlace/list1',
@@ -157,15 +160,17 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -194,7 +199,7 @@
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             });
-
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
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_Warehouse.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_Warehouse.html"
index d0a55d1..74d130d 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_Warehouse.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_Warehouse.html"
@@ -46,13 +46,14 @@
                         <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-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="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
 
                             </div>
                         </script>
@@ -70,7 +71,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
@@ -80,63 +82,81 @@
             , 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: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '浠撳簱浠g爜', title: '浠撳簱浠g爜' }
-                    , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '鍚敤浠撲綅', title: '鍚敤浠撲綅' }
-                ]]
-            };
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Warehouse/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 });
-                }
-            }); 
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            //閲嶇疆鎸夐挳
+        //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
-                $("#btnSearch").click();
+                //$("#btnSearch").click();
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 浠撳簱浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 浠撳簱鍚嶇О like '%" + HName + "%'";
-                }
+                get_FastQuery();
+            });
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                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: '绂佺敤鏍囪' }
+                        , { field: '鍚敤浠撲綅', title: '鍚敤浠撲綅' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Warehouse/list',
@@ -146,7 +166,7 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
@@ -154,22 +174,49 @@
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 浠撳簱浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 浠撳簱鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            //#endregion
+
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '浠撳簱鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
 
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
+        //#endregion 
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-        
 
 
     </script>
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_WorkCenter.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_WorkCenter.html"
index c7a8bcb..15df35c 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_WorkCenter.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_WorkCenter.html"
@@ -9,9 +9,9 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <style media="screen">
-        .custom-tree-item-clicked {
+        /*.custom-tree-item-clicked {
             color: #FC9003
-        }
+        }*/
     </style>
 
 </head>
@@ -21,24 +21,24 @@
             <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;">
+                        <!--<div class="layui-collapse">
+                            <div class="layui-colla-item">-->
+                                <!--<div style="padding: 10px;">-->
                                     <!--<div class="layui-col-xs2">
                                         <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
                                     </div>-->
 
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
+                                </div>-->
 
                                 <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 class="layui-col-xs12 layui-inline" >
+                                            <!--<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
                                         </div>
-                                        <div class="layui-col-xs9 layui-inline">
+                                        <div class="layui-col-xs12 layui-inline">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">浠g爜</label>
@@ -55,6 +55,7 @@
                                                 <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>
@@ -87,18 +88,19 @@
                                         </div>
                                     </div>-->
                                 </div>
-                            </div>
-                        </div>
+                            <!--</div>
+                        </div>-->
                         <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <!--<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" 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>-->
 
                             </div>
                         </script>
@@ -124,6 +126,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -135,149 +138,179 @@
                 , util = layui.util
                 , tree = layui.tree
                 , util = layui.util
+                  var sWhere = "";
+            //#endregion
 
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            var sWhere = "";
-            tree.render({
-                elem: '#treeDepartment',
-                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 = "";
-                    }
-                    //鑾峰彇鎵�鏈夐�変腑鑺傜偣id鏁扮粍
-                    //var oCks = tree.getChecked('demoId'); //鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
-                    //for (var i = 0; i < oCks.length; i++) {
-                    //    //console.log(oCks[0].id, obj.data.id);
-                    //    if (oCks[i].id != obj.data.id) {
-                    //        console.log(oCks[i]);
-                    //        //鎵ц鑺傜偣鍕鹃��
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-                    //        $(oCks[i]).prop("checked", false);
-                    //        $(this).prop("checked", false);
-                    //    }
-                    //}
-                    //form.render('checkbox');
+            //#endregion
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
-                    $.ajax({
-                        url: GetWEBURL() + '/Gy_WorkCenter/cx',
-                        type: "GET",
-                        data: { "HInterID": obj.data.id },
-                        success: function (data1) {
-                            if (data1.count == 1) {
-                                option.data = data1.data;
-                                table.render(option);
-                                layer.close(index);
-                            } else {
-                                layer.close(index);
-                                layer.alert(data1.code + data1.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.close(index);
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                };
+            });
+
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                //$("#btnSearch").click();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+            //#region 淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                if (TagId != "") {
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '缂栬緫宸ヤ綔涓績'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
                         }
-                    });
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
                 }
-            });
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    if (checkStatus.data.length === 1) {
+                        var hID = data[0].HItemID.toString();
+                        TagParentId = data[0].ParentID.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['50%', '50%']
+                            , title: '缂栬緫宸ヤ綔涓績'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                //$(".layui-btn").removeClass("layui-btn-disabled");
+                            }
+                        })
 
-
-            //$.ajax({
-            //    type: "get",
-            //    url: GetWEBURL() + '/Gy_Department/LoadTree',
-            //    async: true,
-            //    success: function (result) {
-            //        //  console.log(result.data);
-            //        var tree = Customerdatatree('treeDepartment', result.data, true);
-            //        tree.onspread = function () {
-            //            var obj = this;
-            //            //妯℃嫙post鍚庡彴鏁版嵁锛屽欢杩�2绉�
-            //            setTimeout(() => {
-            //                var data = getTreeJson(obj.data.HParentID); //寮傛鑾峰彇鏁版嵁
-            //                obj.lazytree(data);
-            //            }, 2000);
-            //        }
-            //        tree.onclick = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.state); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //            console.log(obj.data.children); //褰撳墠鑺傜偣涓嬫槸鍚︽湁瀛愯妭鐐�
-            //        }
-            //        tree.oncheck = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.checked); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //        }
-            //    }
-            //});
-
-
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'radio', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: false }
-                    , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜' }
-                    , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' }
-                    , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
-                    , { field: '宸ヤ綔鏃堕棿', title: '宸ヤ綔鏃堕棿' }
-                    , { field: '璁惧鏁伴噺', title: '璁惧鏁伴噺' }
-                    , { field: '琛屼笟鏍囧噯', title: '琛屼笟鏍囧噯' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Gy_WorkCenter/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 });
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+                //#endregion
+            //#endregion
 
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
 
-            //鏂板
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+               option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '宸ヤ綔涓績浠g爜', title: '宸ヤ綔涓績浠g爜' }
+                        , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' }
+                        //, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬鍚嶇О' }
+                        , { field: '宸ヤ綔鏃堕棿', title: '宸ヤ綔鏃堕棿' }
+                        , { field: '璁惧鏁伴噺', title: '璁惧鏁伴噺' }
+                        , { field: '琛屼笟鏍囧噯', title: '琛屼笟鏍囧噯' }
+                        , { field: '绛夌骇', title: '绛夌骇' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_WorkCenter/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 宸ヤ綔涓績浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ヤ綔涓績鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+           
+            //#region 鏂板
             form.on('submit(btnAdd)', function (obj) {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -299,8 +332,29 @@
                 });
                 return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
             })
+            //#endregion
 
-            //鍒犻櫎
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ヤ綔涓績-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
                 var ModRightNameDelete = 'Gy_WorkCenter_Delete'
                 if (TagId != "") {
@@ -376,145 +430,11 @@
                     }
                 }
             });
-
-
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 宸ヤ綔涓績浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 宸ヤ綔涓績 like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_WorkCenter/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                if (TagId != "") {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '缂栬緫宸ヤ綔涓績'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                }
-                else {
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    if (checkStatus.data.length === 1) {
-                        var hID = data[0].HItemID.toString();
-                        TagParentId = data[0].ParentID.toString();
-                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                        layer.open({
-                            type: 2
-                            , area: ['50%', '50%']
-                            , title: '缂栬緫宸ヤ綔涓績'
-                            , closeBtn: 1
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                            , resize: false,
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            }
-                            , cancel: function () {
-                                //$(".layui-btn").removeClass("layui-btn-disabled");
-                            }
-                        })
-
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+                //#endregion
+            
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_WorkCenter/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
-
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
+        //#endregion
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
new file mode 100644
index 0000000..4a046f2
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkCenter_Add_Edit.html"
@@ -0,0 +1,439 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鐢熶骇璧勬簮</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ヤ綔涓績浠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" />
+                                    <input id="HParentID" name="HParentID" type="hidden" />
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ヤ綔涓績鍚嶇О</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ヤ綔鏃堕棿</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍔╄鐮�</label>
+                                <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">璁惧鏁伴噺</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" value="0">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">琛屼笟鏍囧噯</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HDayMoney" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閮ㄩ棬</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                    <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>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <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" title="鏄惁绂佺敤">
+                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs8 layui-inline">
+                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                    <input type="hidden" value="0" name="HParentID" id="HParentID">
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        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
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            //閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(HProc-BT)', function () {
+                get_checkProc();
+            });
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(HWorkingProcedure-BT)', function () {
+                get_checkWorkCenter();
+            });
+
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(ProductionTeam-BT)', function () {
+                get_checkGroup();
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid){
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Gy_WorkCenter/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.HStopflag;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HNumber": data.HNumber
+                                , "HItemID": data.HItemID
+                                , "HName": data.HName
+                                , "HDeptName": data.HDeptName
+                                , "HWorkTimes": data.HWorkTimes
+                                , "HHelpCode": data.HHelpCode
+                                , "HQty": data.HQty
+                                , "HBarCodeForBase": data.HBarCodeForBase
+                                , "HDayMoney": data.HDayMoney
+                                , "HDeptID": data.HDeptID
+                                , "HStopflag": data.HStopflag
+                                , "HRemark": data.HRemark
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                var sMainStr = JSON.stringify(data.field);
+                if (!$("#HDeptName").val()) {
+                    layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HWorkTimes").val()) {
+                    layer.msg("璇疯緭鍏ュ伐浣滄椂闂达紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HQty").val()) {
+                    layer.msg("璇疯緭鍏ヨ澶囨暟閲忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_WorkCenter/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ュ簭鏂规硶
+            function get_checkProc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ヤ綔涓績鏂规硶
+            function get_checkWorkCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Gy_WorkCenter_Add_Edit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index fe2bb95..8f49276 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -8,10 +8,13 @@
     <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/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
     <style media="screen">
-        .custom-tree-item-clicked {
-            color: #FC9003
-        }
+          /* .custom-tree-item-clicked {
+            color: #FC9003*/
+        /*}*/
     </style>
 
 </head>
@@ -21,77 +24,34 @@
             <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;">
-                                    <!--<div class="layui-col-xs2">
-                                        <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
-                                    </div>-->
-
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
-                                            <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>
-                                        </div>
-                                        <div class="layui-col-xs9 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">鍚嶇О</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HName" id="HName">
-                                                    </div>
-                                                </div>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <div 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>
+                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                     </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>
-                                    </div>-->
                                 </div>
                             </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="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
                                 <!--<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>
@@ -99,7 +59,6 @@
                                 <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>-->
-
                             </div>
                         </script>
                     </form>
@@ -107,14 +66,6 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
-
-
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
-    <!--<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>-->
     <script>
         var treeCkData = { id: 0 };
         var TagId = "";
@@ -124,6 +75,7 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+        //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -135,148 +87,180 @@
                 , util = layui.util
                 , tree = layui.tree
                 , util = layui.util
-
-
             var sWhere = "";
-            tree.render({
-                elem: '#treeDepartment',
-                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 = "";
-                    }
-                    //鑾峰彇鎵�鏈夐�変腑鑺傜偣id鏁扮粍
-                    //var oCks = tree.getChecked('demoId'); //鑾峰彇閫変腑鑺傜偣鐨勬暟鎹�
-                    //for (var i = 0; i < oCks.length; i++) {
-                    //    //console.log(oCks[0].id, obj.data.id);
-                    //    if (oCks[i].id != obj.data.id) {
-                    //        console.log(oCks[i]);
-                    //        //鎵ц鑺傜偣鍕鹃��
+            var option = [];
+            //#endregion
 
-                    //        $(oCks[i]).prop("checked", false);
-                    //        $(this).prop("checked", false);
-                    //    }
-                    //}
-                    //form.render('checkbox');
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
 
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-                    $.ajax({
-                        url: GetWEBURL() + '/Gy_Group/cx',
-                        type: "GET",
-                        data: { "HInterID": obj.data.id },
-                        success: function (data1) {
-                            if (data1.count == 1) {
-                                option.data = data1.data;
-                                table.render(option);
-                                layer.close(index);
-                            } else {
-                                layer.close(index);
-                                layer.alert(data1.code + data1.Message, { icon: 5 });
-                            }
-                        }, error: function () {
-                            layer.close(index);
-                            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //#endregion
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                //$("#btnSearch").click();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#region 淇敼鎸夐挳
+            form.on('submit(btnModify)', function (data) {
+                if (TagId != "") {
+                    layer.open({
+                        type: 2
+                        , area: ['50%', '50%']
+                        , title: '缂栬緫鐝粍'
+                        , closeBtn: 1
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                        , resize: false,
+                        end: function () {
+                            //鍒锋柊椤甸潰,
+                            location.reload();
                         }
-                    });
+                        , cancel: function () {
+                            location.reload();
+                        }
+                    })
                 }
-            });
+                else {
+                    var checkStatus = table.checkStatus('mainTable')
+                        , data = checkStatus.data;
+                    if (checkStatus.data.length === 1) {
+                        var hID = data[0].HItemID.toString();
+                        TagParentId = data[0].ParentID.toString();
+                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                        layer.open({
+                            type: 2
+                            , area: ['50%', '50%']
+                            , title: '缂栬緫鐝粍'
+                            , closeBtn: 1
+                            , shade: 0.6 //閬僵閫忔槑搴�
+                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                            , content: ['../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
+                            , resize: false,
+                            end: function () {
+                                //鍒锋柊椤甸潰,
+                                location.reload();
+                            }
+                            , cancel: function () {
+                                location.reload();
+                            }
+                        })
 
-
-            //$.ajax({
-            //    type: "get",
-            //    url: GetWEBURL() + '/Gy_Department/LoadTree',
-            //    async: true,
-            //    success: function (result) {
-            //        //  console.log(result.data);
-            //        var tree = Customerdatatree('treeDepartment', result.data, true);
-            //        tree.onspread = function () {
-            //            var obj = this;
-            //            //妯℃嫙post鍚庡彴鏁版嵁锛屽欢杩�2绉�
-            //            setTimeout(() => {
-            //                var data = getTreeJson(obj.data.HParentID); //寮傛鑾峰彇鏁版嵁
-            //                obj.lazytree(data);
-            //            }, 2000);
-            //        }
-            //        tree.onclick = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.state); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //            console.log(obj.data.children); //褰撳墠鑺傜偣涓嬫槸鍚︽湁瀛愯妭鐐�
-            //        }
-            //        tree.oncheck = function () {
-            //            var obj = this;
-            //            console.log(obj.data); //寰楀埌褰撳墠鐐瑰嚮鐨勮妭鐐规暟鎹�
-            //            console.log(obj.checked); //寰楀埌褰撳墠鑺傜偣鐨勫睍寮�鐘舵�侊細open銆乧lose銆乶ormal
-            //            console.log(obj.elem); //寰楀埌褰撳墠鑺傜偣鍏冪礌
-            //        }
-            //    }
-            //});
-
-
-
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                , height: 'full-50'
-                , page: true
-                , cellMinWidth: 90
-                , cols: [[
-                    { type: 'radio', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
-                    , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
-                    , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
-                    , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                    
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                url: GetWEBURL() + '/Gy_Group/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 });
+                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             });
+            //#endregion
+
+        //#endregion
+
+        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                 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: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
+                        , { field: '鐝粍浠g爜', title: '鐝粍浠g爜' }
+                        , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '浣跨敤鏍囪', title: '浣跨敤鏍囪' }
+                        , { field: '閮ㄩ棬浠g爜', title: '閮ㄩ棬浠g爜' }
+                        , { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+
+                    ]]
+                };
+            }
+            //#endregion
+
+            //#region 鏌ヨ
+                function get_Display(sWhere) {
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_Group/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+              }
+           
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 鐝粍浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 鐝粍鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
 
 
-
-            //鏂板
+            //#region 鏂板
             form.on('submit(btnAdd)', function (obj) {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
@@ -298,8 +282,29 @@
                 });
                 return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
             })
+            //#endregion
 
-            //鍒犻櫎
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '鐢熶骇鐝粍-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
+
+            //#region 鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
                 var ModRightNameDelete = 'Gy_Group_Delete'
                 if (TagId != "") {
@@ -375,145 +380,11 @@
                     }
                 }
             });
+           // #endregion
 
-
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 鐝粍浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 鐝粍 like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_Group/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                if (TagId != "") {
-                    layer.open({
-                        type: 2
-                        , area: ['50%', '50%']
-                        , title: '缂栬緫鐝粍'
-                        , closeBtn: 1
-                        , shade: 0.6 //閬僵閫忔槑搴�
-                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: ['../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html?hID=' + TagId + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                        , resize: false,
-                        end: function () {
-                            //鍒锋柊椤甸潰,
-                            location.reload();
-                        }
-                        , cancel: function () {
-                            //$(".layui-btn").removeClass("layui-btn-disabled");
-                        }
-                    })
-                }
-                else {
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    if (checkStatus.data.length === 1) {
-                        var hID = data[0].HItemID.toString();
-                        TagParentId = data[0].ParentID.toString();
-                        //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
-                        layer.open({
-                            type: 2
-                            , area: ['50%', '50%']
-                            , title: '缂栬緫鐝粍'
-                            , closeBtn: 1
-                            , shade: 0.6 //閬僵閫忔槑搴�
-                            , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                            , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                            , content: ['../宸ヨ祫鍩虹璧勬枡/Add_Edit_Gy_Group.html?hID=' + hID + '&HType=Modify&TagParentId=' + TagParentId + '', 'yes']
-                            , resize: false,
-                            end: function () {
-                                //鍒锋柊椤甸潰,
-                                location.reload();
-                            }
-                            , cancel: function () {
-                                //$(".layui-btn").removeClass("layui-btn-disabled");
-                            }
-                        })
-
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+        //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
-
-            $.ajax({
-                url: GetWEBURL() + '/Gy_Group/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
-
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.ParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
     </script>
 
 </body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
new file mode 100644
index 0000000..9640b4d
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -0,0 +1,434 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫鐝粍璁剧疆</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鐝粍浠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 layui-inline">
+                                <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 layui-inline">
+                                <label class="layui-form-label">浜烘暟</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HEmpQty" lay-verify="HEmpQty" id="HEmpQty" value="0">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">閮ㄩ棬</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                    <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>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鍔╄鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">鏉″舰鐮�</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HBarCodeForBase" lay-verify="HBarCodeForBase" id="HBarCodeForBase">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ュ簭</label>
+                                <div class="layui-input-inline">
+                                    <input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HProcID" id="HProcID" value="0">
+                                    <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>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <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" title="鏄惁绂佺敤">
+                                    <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="layui-row">
+
+                            <div class="layui-col-xs8 layui-inline">
+                                <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                    <input type="hidden" value="0" name="HParentID" id="HParentID">
+                    <input type="hidden" value="true" name="HUseFlag" id="HUseFlag">
+                </form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        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
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            ////鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            ////閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(HProc-BT)', function () {
+                get_checkProc();
+            });
+
+            ////閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+            ////閫夋嫨宸ヤ綔涓績鎸夐挳
+            //form.on('submit(HWorkingProcedure-BT)', function () {
+            //    get_checkWorkCenter();
+            //});
+
+            ////閫夋嫨鐝粍鎸夐挳
+            //form.on('submit(ProductionTeam-BT)', function () {
+            //    get_checkGroup();
+            //});
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid){
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Gy_Group/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("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
+                                , "HDeptName": data.閮ㄩ棬鍚嶇О
+                                , "HName": data.鐝粍鍚嶇О
+                                , "HEmpQty": data.浜烘暟
+                                , "HDeptID": data.HDeptID
+                                , "HHelpCode": data.鍔╄鐮�
+                                , "HBarCodeForBase": data.鏉$爜缂栧彿
+                                , "HProcID": data.HProcID
+                                , "HProcName": data.宸ュ簭
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.澶囨敞
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                if (!$("#HProcID").val()) {
+                    layer.msg("璇烽�夋嫨宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HEmpQty").val()) {
+                    layer.msg("璇疯緭鍏ヤ汉鏁帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    //url:"http://localhost:30552/Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                        console.log("Reason" + sMainStr);
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ュ簭鏂规硶
+            function get_checkProc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ヤ綔涓績鏂规硶
+            function get_checkWorkCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Gy_Group_Add_Edit.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </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/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 0894a6d..f3fd7f2 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"
@@ -180,7 +180,6 @@
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             var data = result.data.h_v_IF_Edit_BadReasonList[0];
-                            console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
                             var IsHStopflag = data.绂佺敤鏍囪;
                             //绂佺敤鏍囪
                             if (IsHStopflag == "true") {
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_Process.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_Process.html"
new file mode 100644
index 0000000..f138628
--- /dev/null
+++ "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_Process.html"
@@ -0,0 +1,555 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>鏂板/缂栬緫宸ュ簭鍒楄〃</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <style>
+        .layui-form-item .layui-inline {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            margin-right: 0px;
+        }
+        .layui-form-label {
+            width: 25%;
+        }
+    </style>
+</head>
+<body>
+
+    <div class="layui-fluid" style="padding: 0;">
+        <div class="layui-card" style="padding: 15px;">
+            <div class="layui-card-body" style="padding: 1px;">
+                <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button>
+                        </div>
+                    </div>
+                    <div class="layui-form-item" style="padding-top: 10px;">
+                        <div class="layui-row">
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ュ簭浠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 layui-inline">
+                                <label class="layui-form-label">姹囨姤绫诲瀷</label>
+                                <div class="layui-input-inline" style="margin-bottom: -15px;">
+                                    <div class="layui-form">
+                                        <div class="layui-form-item">
+                                            <select name="HType" id="HType">
+                                                <option value="">璇烽�夋嫨绫诲瀷</option>
+                                                <option value="璁惧">璁惧</option>
+                                                <option value="娴佹按绾�">娴佹按绾�</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-col-xs4 layui-inline">
+                                <label class="layui-form-label">宸ュ簭鍚嶇О</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" name="HName" lay-verify="HName" id="HName" autocomplete="off">
+
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">鐝骇瀹氶</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HFixPrice" lay-verify="HFixPrice" id="HFixPrice" autocomplete="off">
+
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <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 layui-inline">
+                                    <label class="layui-form-label">鍔犵彮琛ヨ创瀹氶</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HOverFixPrice" id="HOverFixPrice" value="0" autocomplete="off">
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">鏉″舰鐮�</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HBarCode" id="HBarCode" autocomplete="off">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">搴忓彿</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="HSno" id="HSno" lay-verify="" autocomplete="off" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">宸ユ</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="HProcMulName" id="HProcMulName" class="layui-input" value="" style="float:left;width:150px;">
+                                        <input type="hidden" name="HProcMulID" id="HProcMulID" value="0">
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">閮ㄩ棬浠g爜</label>
+                                    <div class="layui-input-inline">
+                                        <input class="layui-input" name="HDeptNumber" id="HDeptNumber" autocomplete="off">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">閮ㄩ棬杞﹂棿</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+                                        <input type="hidden" name="HDeptID" id="HDeptID" value="0">
+                                        <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>
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">ERP宸ュ簭</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" name="HProcessName_K3" id="HProcessName_K3" class="layui-input" value="" style="float:left;width:150px;">
+                                        <input type="hidden" name="HProcessID_K3" id="HProcessID_K3" value="0">
+                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="" style="width: 40px; background-color: gainsboro;">
+                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left: -9px; color: black;"></i>
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                    <div class="layui-input-inline">
+                                        <input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
+                                        <input type="hidden" value="false" name="HStopflag" id="HStopflag">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">娴佽浆鏍囪</label>
+                                    <div class="layui-input-inline">
+                                        <input type="checkbox" name="checkboxHTypeFlow" id="checkboxHTypeFlow" lay-skin="primary" lay-filter="checkboxHTypeFlow" value="true" title="鏄惁绂佺敤">
+                                        <input type="hidden" value="false" name="HTypeFlow" id="HTypeFlow">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">鏍哥畻鏍囪</label>
+                                    <div class="layui-input-inline">
+                                        <input type="checkbox" name="checkboxHTypeCount" id="checkboxHTypeCount" lay-skin="primary" lay-filter="checkboxHTypeCount" value="true" title="鏄惁绂佺敤">
+                                        <input type="hidden" value="false" name="HTypeCount" id="HTypeCount">
+                                    </div>
+                                </div>
+                                <div class="layui-col-xs4 layui-inline">
+                                    <label class="layui-form-label">鑷姩绉昏浆</label>
+                                    <div class="layui-input-inline">
+                                        <input type="checkbox" name="checkboxHAutoTrunFlag" id="checkboxHAutoTrunFlag" lay-skin="primary" lay-filter="checkboxHAutoTrunFlag" value="true" title="鏄惁绂佺敤">
+                                        <input type="hidden" value="false" name="HAutoTrunFlag" id="HAutoTrunFlag">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs8 layui-inline">
+                                    <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+                                    <div class="layui-input-block">
+                                        <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-row">
+                                <div class="layui-col-xs8 layui-inline">
+                                    <label class="layui-form-label" style="width: 12.5%;">鏈伐搴忕‘璁よ褰�</label>
+                                    <div class="layui-input-block">
+                                        <input class="layui-input" name="HProcCheckNote" id="HProcCheckNote" autocomplete="off" style=" width: 75%;">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                            <input type="hidden" value="0" name="HParentID" id="HParentID">
+</form>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        //#region 鎶樺彔娉ㄩ噴
+        //#endregion
+        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
+                , element = layui.element;
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+        //#endregion
+
+
+        //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            get_LoginIs();
+
+            //鑾峰彇椤甸潰璺宠浆鍙傛暟
+            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]];//婧愬崟绫诲瀷
+            }
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
+                $("#HItemID").val(0);
+            }
+            else if (OperationType == 3) {//缂栬緫
+                $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+            }
+            else if (OperationType == 4) {//娴忚
+                $("#HItemID").val(linterid);//
+                //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
+                RoadBillMain(linterid);
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+
+        //#endregion
+
+
+        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //閫�鍑烘寜閽�
+            form.on('submit(Cancel)', function () {
+                Pub_Close(1);
+            })
+
+            //鏄惁绂佺敤鎸夐挳
+            form.on('checkbox(checkboxHStopflag)', function (data) {
+                $("#HStopflag").val(data.elem.checked);
+            });
+
+            //娴佽浆鏍囪鎸夐挳
+            form.on('checkbox(checkboxHTypeFlow)', function (data) {
+                $("#HTypeFlow").val(data.elem.checked);
+            });
+
+            //鏍哥畻鏍囪鎸夐挳
+            form.on('checkbox(checkboxHTypeCount)', function (data) {
+                $("#HTypeCount").val(data.elem.checked);
+            });
+
+            //鑷姩绉昏浆鎸夐挳
+            form.on('checkbox(checkboxHAutoTrunFlag)', function (data) {
+                $("#HAutoTrunFlag").val(data.elem.checked);
+            });
+
+            //閫夋嫨宸ュ簭鎸夐挳
+            form.on('submit(HProc-BT)', function () {
+                get_checkProc();
+            });
+
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDepart-BT)', function () {
+                get_checkDept();
+            });
+
+            //閫夋嫨宸ヤ綔涓績鎸夐挳
+            form.on('submit(HWorkingProcedure-BT)', function () {
+                get_checkWorkCenter();
+            });
+
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(ProductionTeam-BT)', function () {
+                get_checkGroup();
+            });
+
+            //淇濆瓨鎸夐挳
+            form.on('submit(set_SaveBill)', function (data) {
+                set_SaveBill(data);
+            });
+
+        //#endregion
+
+
+        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+            function get_LoginIs() {
+                if (sessionStorage.login != "login") {
+                    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+                        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+                    }, function () { window.location.href = "../../user/login.html"; });
+                }
+            }
+            //#endregion
+
+            //#region 鍔犺浇琛ㄥご
+            function RoadBillMain(linterid){
+                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    url: GetWEBURL() + "Gy_Process/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID":  linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            var IsHTypeFlow = data.娴佽浆鏍囪;
+                            var IsHTypeCount = data.鏍哥畻鏍囪;
+                            var IsHAutoTrunFlag = data.鑷姩绉昏浆;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            if (IsHTypeFlow) {
+                                $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
+                            }
+                            if (IsHTypeCount) {
+                                $("input[name='checkboxHTypeCount'][value='" + IsHTypeCount + "']").attr("checked", true);
+                            }
+                            if (IsHAutoTrunFlag) {
+                                $("input[name='checkboxHAutoTrunFlag'][value='" + IsHAutoTrunFlag + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HNumber": data.宸ュ簭浠g爜
+                                , "HItemID": data.HItemID
+                                , "HName": data.宸ュ簭鍚嶇О
+                                , "HFixPrice": data.鐝骇瀹氶
+                                , "HLevel": data.绛夌骇
+                                , "HProcMulName": data.宸ユ鍚嶇О
+                                , "HProcMulID": data.宸ユID
+                                , "HBarCode": data.鏉″舰鐮�
+                                , "HHelpCode": data.鍔╄鐮�
+                                , "HDeptName": data.閮ㄩ棬
+                                , "HDeptID": data.HDeptID
+                                , "HDeptNumber": data.閮ㄩ棬浠g爜
+                                , "HOverFixPrice": data.鍔犵彮琛ヨ创瀹氶
+                                , "HSno": data.搴忓彿
+                                , "HProcessName_K3": data.ERP宸ュ簭鍚嶇О
+                                , "HProcessID_K3": data.ERP宸ュ簭ID
+                                , "HType": data.姹囨姤绫诲瀷
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HTypeFlow": data.娴佽浆鏍囪
+                                , "HTypeCount": data.鏍哥畻鏍囪
+                                , "HAutoTrunFlag": data.鑷姩绉昏浆
+                                , "HRemark": data.澶囨敞
+                                , "HProcCheckNote": data.鏈伐搴忕‘璁よ褰�
+                            });
+                            layer.close(ajaxLoad);
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鍙戠敓閿欒!", { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 淇濆瓨鏂规硶
+            function set_SaveBill(data) {
+                if (!$("#HType").val()) {
+                    layer.msg("璇烽�夋嫨姹囨姤绫诲瀷锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //if (!$("#HProcMulID").val()) {
+                //    layer.msg("璇烽�夋嫨宸ユ锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                if (!$("#HDeptName").val()) {
+                    layer.msg("璇烽�夋嫨閮ㄩ棬杞﹂棿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                //if (!$("#HProcessID_K3").val()) {
+                //    layer.msg("璇烽�夋嫨ERP宸ュ簭锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                //    return;
+                //}
+                var sMainStr = JSON.stringify(data.field);
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Process/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    async: true,
+                    data: { "oMain": sMainStr },
+                    dataType: "json",
+                    success: function (data) {
+                        if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            layer.msg(data.Message, { icon: 1 });
+                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+                            //淇濆瓨鍚庢祻瑙�
+                            ReRoadBillMain();
+                        }
+                        else {
+                            layer.alert(data.Message, { icon: 5 });
+                        }
+                        layer.closeAll("loading");
+                    },
+                    error: function (err) {
+                        layer.alert("閿欒:" + err, { icon: 5 });
+                    }
+                });
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ュ簭鏂规硶
+            function get_checkProc() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HProcName").val(checkStatus.data[0].宸ュ簭);
+                        $("#HProcID").val(checkStatus.data[0].HItemID);
+                        $("#HProcNumber").val(checkStatus.data[0].宸ュ簭浠g爜);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , 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);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨宸ヤ綔涓績鏂规硶
+            function get_checkWorkCenter() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ヤ綔涓績鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
+                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鐝粍鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/GroupInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HGroup").val(checkStatus.data[0].HName);
+                        $("#HGroupID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Process.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                //document.location.href('Add_Edit_Gy_Source.html ? OperationType = 4 & linterid=' + linterid + ' & HSouceBillType=');
+                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+            }
+            //#endregion
+
+        //#endregion
+
+
+        //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </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/Add_Edit_Gy_Source.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_Source.html"
index 6420de8..316f0ee 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_Source.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_Source.html"
@@ -306,7 +306,7 @@
                             var data = result.data.h_v_Edit_IF_SourceList[0];
                             var IsHStopflag = data.绂佺敤鏍囪;
                             //绂佺敤鏍囪
-                            if (IsHStopflag == "true") {
+                            if (IsHStopflag) {
                                 $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                             }
                             form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
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_Process.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_Process.html"
index e6ee197..b80d5a6 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_Process.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_Process.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,7 +9,11 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -47,12 +51,13 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-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-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>-->
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
 
                             </div>
                         </script>
@@ -61,96 +66,111 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
-            //var sWhere = " 浜у搧浠g爜 = 'BX0002'";
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            var option = [];
             var sWhere = "";
+            //#endregion 
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '宸ュ簭浠g爜', title: '宸ュ簭浠g爜' }
-                    , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
-                    , { field: '绛夌骇', title: '绛夌骇' }
-                    , { field: '娴佽浆鏍囪', title: '娴佽浆鏍囪' }
-                    , { field: '鏍哥畻鏍囪', title: '鏍哥畻鏍囪' }
-                    , { field: '姹囨姤绫诲瀷', title: '姹囨姤绫诲瀷' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                    , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
-                    , { field: '搴忓彿', title: '搴忓彿' }
-                    , { field: '瀵瑰簲K3浠g爜', title: '瀵瑰簲K3浠g爜' }
-                    , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
-                    , { field: '鐝骇瀹氶', title: '鐝骇瀹氶' }
-                    , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶' }
-                    , { field: '鑷姩绉昏浆', title: '鑷姩绉昏浆' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: 'HProcessID_K3', title: 'HProcessID_K3' }
-                    , { field: 'ERP宸ュ簭浠g爜', title: 'ERP宸ュ簭浠g爜' }
-                    , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О' }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Process/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 });
-                }
-            }); 
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            //閲嶇疆鎸夐挳
+            //#endregion
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+           table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");//宸ュ簭浠g爜
                 $("#HName").val("");//宸ュ簭鍚嶇О
-                $("#btnSearch").click();
+                //$("#btnSearch").click();
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();//宸ュ簭浠g爜
-                var HName = $("#HName").val();//宸ュ簭鍚嶇О
-                if (HNumber) {
-                    sWhere += " and 宸ュ簭浠g爜 like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and 宸ュ簭鍚嶇О like '%" + HName + "%'";
-                }
+                get_FastQuery();
+            });
+            //#endregion
+
+          //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
+            function set_InitGrid() {
+                 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: '鏍哥畻鏍囪' }
+                        , { field: '姹囨姤绫诲瀷', title: '姹囨姤绫诲瀷' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                        , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+                        , { field: '搴忓彿', title: '搴忓彿' }
+                        , { field: '瀵瑰簲K3浠g爜', title: '瀵瑰簲K3浠g爜' }
+                        , { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
+                        , { field: '鐝骇瀹氶', title: '鐝骇瀹氶' }
+                        , { field: '鍔犵彮琛ヨ创瀹氶', title: '鍔犵彮琛ヨ创瀹氶' }
+                        , { field: '鑷姩绉昏浆', title: '鑷姩绉昏浆' }
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: 'HProcessID_K3', title: 'HProcessID_K3' }
+                        , { field: 'ERP宸ュ簭浠g爜', title: 'ERP宸ュ簭浠g爜' }
+                        , { field: 'ERP宸ュ簭鍚嶇О', title: 'ERP宸ュ簭鍚嶇О' }
+                    ]]
+                };
+            }
+
+               //#endregion
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Process/list',
@@ -160,32 +180,61 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
                         } else {
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
+
+            }
+            //#endregion
+
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();//宸ュ簭浠g爜
+                var HName = $("#HName").val();//宸ュ簭鍚嶇О
+                if (HNumber) {
+                    sWhere += " and 宸ュ簭浠g爜 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 宸ュ簭鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            //#endregion
 
+            //#region 缂栬緫
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].HItemID.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '宸ュ簭鍒楄〃-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+                }
+            }
+            //#endregion
 
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
-            //浠ヤ笂鏄痩ayui妯″潡
         });
-
         
+        //#endregion
 
-
+        //浠ヤ笂鏄痩ayui妯″潡
     </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.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 5160822..f7418ea 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"
@@ -31,9 +31,9 @@
                                 <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 id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
                                         </div>
-                                        <div class="layui-col-xs9 layui-inline">
+                                        <div class="layui-col-xs12 layui-inline">
                                             <div class="layui-row">
                                                 <div class="layui-inline">
                                                     <label class="layui-form-label">瀹㈡埛浠g爜</label>
@@ -111,7 +111,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
@@ -121,7 +122,9 @@
             , laypage = layui.laypage
             , laydate = layui.laydate
             var sWhere = "";
+            //#endregion 
 
+            //#region 鍒濆鍖栬〃鏍兼柟娉�
             var option = {
                 elem: '#mainTable'
                 //, toolbar: '#toolbarDemo'
@@ -141,7 +144,9 @@
             };
 
             var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+            //#endregion
+
+            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
             $.ajax({
                 //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                 url: GetWEBURL() + '/Gy_Customer/list',
@@ -161,16 +166,17 @@
                     layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                 }
             }); 
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
                 $("#HNumber").val("");
                 $("#HName").val("");
                 $("#btnSearch").click();
             });
+            //#endregion
 
-
-            //鍒犻櫎
+            //#region 鍒犻櫎
             form.on('submit(btndelete)', function (obj) {
                 var ModRightNameDelete = 'Gy_Department_Delete'
 
@@ -201,8 +207,9 @@
                     }
                 });
             });
+            //#endregion
 
-            //淇敼鎸夐挳
+            //#region 淇敼鎸夐挳
             form.on('submit(btnModify)', function (data) {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
@@ -217,8 +224,9 @@
                     , resize: false
                 })
             });
+            //#endregion
 
-            //鏌ヨ鎸夐挳
+            //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
@@ -250,7 +258,7 @@
 
 
         });
-
+        //#endregion 
         
 
 

--
Gitblit v1.9.1