From 46aa1b22c4f0cfc685dd1ccd327ca6e173fea6eb Mon Sep 17 00:00:00 2001
From: 仲国强 <519541279@qq.com>
Date: 星期四, 09 九月 2021 15:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html              |  803 ++++---
 WebTM/views/车间管理/工序进站接收单/Cj_StationQty.html                |  198 +
 WebTM/views/user/login.html                                |    4 
 WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html               |   13 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html          |  655 +++--
 WebTM/views/基础资料/公用基础资料/Gy_Material.html                   |   90 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Currency.html          |   18 
 WebTM/views/基础资料/销售基础资料/Gy_Customer.html                   |  395 +-
 WebTM/views/设备管理/Sb_EquipMaintainPlanBillEdit.html         |    8 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Xt_ORGANIZATIONSList.html |    3 
 WebTM/views/基础资料/公用基础资料/Gy_Unit.html                       |   88 
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html         | 1009 +++++---
 WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html                  |  150 +
 WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html             |  231 +
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html              |   23 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Warehouse.html         |  377 +++
 WebTM/views/基础资料/公用基础资料/Xt_ORGANIZATIONSList.html          |    2 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html        |   30 
 WebTM/views/基础资料/采购基础资料/Gy_Supplier.html                   |  275 +
 /dev/null                                                  |  490 ----
 WebTM/views/基础资料/销售基础资料/Gy_Customer_Edit.html              |  841 ++++---
 WebTM/layuiadmin/Scripts/webConfig.js                      |    4 
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Department.html        |  362 +++
 WebTM/views/基础资料/公用基础资料/Gy_Currency.html                   |   85 
 WebTM/WebTM.csproj                                         |    4 
 WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html                 |  410 +--
 26 files changed, 3,891 insertions(+), 2,677 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ff483fb..2fdc384 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -109,7 +109,9 @@
     <Content Include="views\PublicPage\CheckItemInformation.html" />
     <Content Include="views\PublicPage\Gy_Maintain.html" />
     <Content Include="views\ReportHtml.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Warehouse.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Xt_ORGANIZATIONSList.html" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_Department.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Employee_Add_Edit_.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_WorkCenter_Add_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_MouldType.html" />
@@ -525,11 +527,9 @@
     <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" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\test.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Xt_ORGANIZATIONSList.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PropertyList.html" />
-    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Department_Edit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Material.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_Unit.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockPlace.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a808e1a..e6b0b20 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,7 +2,7 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
@@ -10,7 +10,7 @@
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
-    var WEBURL = "http://localhost/API/";
+    //var WEBURL = "http://localhost/API/";
     return WEBURL
 }
 
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index b2f1473..353ec0e 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -32,11 +32,11 @@
                 </div>
                 <div class="layui-form-item">
                     <label class="layadmin-user-login-icon layui-icon layui-icon-username login-input" for="LAY-user-login-password"></label>
-                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;" autocomplete="off">
+                    <input type="text" name="username" id="LAY-user-login-username" lay-verify="required" placeholder="鐢ㄦ埛鍚�" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
                 </div>
                 <div class="layui-form-item">
                     <label class="layadmin-user-login-icon layui-icon layui-icon-password login-input" for="LAY-user-login-password"></label>
-                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;" autocomplete="off">
+                    <input type="password" name="password" id="LAY-user-login-password" lay-verify="required" placeholder="瀵嗙爜" class="layui-input" style="background-color:transparent;color:white" autocomplete="off">
                 </div>
                 <div class="layui-form-item">
                     <button type="button" lay-submit="" class="layui-btn layui-btn-fluid" id="LAY-user-login-submit" name="LAY-user-login-submit" lay-filter="LAY-user-login-submit">鐧� 鍏�</button>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Currency.html"
index 4c51d4f..f50d6fe 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Currency.html"
@@ -147,7 +147,6 @@
 
             function RoadBillMain(hID)//鍔犺浇琛ㄥご
             {
-                alert(hID);
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
                     url: GetWEBURL() + "GetGy_CurrencyDetail",
@@ -200,7 +199,7 @@
                 $("#HItemID").val(hID);//淇敼鏃朵富琛↖D
                 RoadBillMain(hID);
 
-               /* RoadBillSub(linterid);*/
+                /* RoadBillSub(linterid);*/
             }
             //绂佺敤鏍囧織
             form.on('checkbox(checkboxHStopflag)', function (data) {
@@ -356,11 +355,10 @@
 
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
-                if (hID == null || hID==0) {
+                if (hID == null || hID == 0) {
                     parent.location.href = "../../../views/index.html"
                 }
-                else
-                {
+                else {
                     var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                     parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                 }
@@ -382,7 +380,7 @@
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
                                 f_alert(data.Message);
@@ -417,12 +415,12 @@
         });
         //瀹氫箟鍏ㄥ眬鍙橀噺
         var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID,ZRProcName,QRName
+            ProcID, ZRProcName, QRName
             ;
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
-             HReasonName = obj[0].HName;
-             ReasonID = obj[0].HItemID;
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
         }
         //杩斿洖鐗╂枡
         function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
@@ -441,7 +439,7 @@
             $("#HDeptID").val(obj[0].HItemID);
             $("#HDeptNumber").val(obj[0].HNumber);
         }
-         //杩斿洖鍗曚綅
+        //杩斿洖鍗曚綅
         function GetHUnitNameValue(obj) {
             $("#HUName").val(obj[0].HName);
             $("#HUnitID").val(obj[0].HItemID);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Department.html"
new file mode 100644
index 0000000..bfa0cbd
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Department.html"
@@ -0,0 +1,362 @@
+锘�<!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 type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" 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="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+                                </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>
+                        <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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-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 id="HItemID" name="HItemID" type="hidden" />
+                    <input id="HUseOrgID" name="HUseOrgID" type="hidden" />
+                    <!--<input id="HParentID" name="HParentID" type="hidden" value="0" />-->
+                </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 sWhere = "";
+            var date = new Date();
+            var day = date.getDate();
+            var month = date.getMonth() + 1;
+            var year = date.getFullYear();
+            var shijian = year + "-" + month + "-" + day;
+            $("#HUseOrgID").val(sessionStorage["OrganizationID"]);
+            //#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(HEmp-BT)', function () {
+                get_checkEmp();
+            });
+            ////閫夋嫨鑱屽憳鎸夐挳
+            //form.on('submit(HEmpID-BT)', function () {
+            //    get_checkEmpID();
+            //});
+
+            ////閫夋嫨閮ㄩ棬鎸夐挳
+            //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_Department/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
+                                //, "HParentID": data.HParentID
+                                , "HName": data.閮ㄩ棬鍚嶇О
+                                , "HHelpCode": data.HHelpCode
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.HEmpName
+                                , "HBarCode": data.HItemID
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.HRemark
+                                //, "HUseOrg": data.浣跨敤缁勭粐
+                                //, "HUseOrgID": data.浣跨敤缁勭粐ID
+                                //, "HItemID": data.鏉$爜缂栧彿
+                                //, "HBarCode": data.鏉″舰鐮�
+                                //, "HCreator": data.鍒涘缓浜�
+                                //, "lngBillKey": data.lngBillKey
+                                //, "lngBillSubKey": data.lngBillSubKey
+                                //, "HMaker": data.HMaker
+                                //, "HCreateDate": data.鍒涘缓鏃ユ湡
+                                //, "HUpDater": data.淇敼浜�
+                                //, "HUpDateDate": 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);
+                if (!$("#HNumber").val()) {
+                    layer.msg("璇疯緭鍏ラ儴闂ㄤ唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HName").val()) {
+                    layer.msg("璇疯緭鍏ラ儴闂ㄥ悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨璐熻矗浜猴紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Department/AddBill1", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Department.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/Add_Edit_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/Add_Edit_Gy_Material.html"
index 7bcf018..9bc94a3 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Material.html"
@@ -8,325 +8,383 @@
     <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;
-        }
-
+    <style type="text/css">
         .layui-form-label {
-            width: 25%;
+            width: 85px;
         }
     </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;">
+    <div id="layout1" class="layui-fluid">
+        <div class="layui-row layui-col-space15">
+            <div class="layui-col-md12">
+                <div class="layui-card">
+                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+                                <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>
+                                <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+                                <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>
 
-                <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="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>-->
-                            <!--<button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>-->
-                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-                            <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</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 type="text" name="HNumber" id="HNumber" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HItemID" id="HItemID" 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="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="HModel" id="HModel" 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="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 type="text" name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HUnitID" id="HUnitID" 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="text" name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" 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>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <ul class="layui-tab-title">
+                                    <li class="layui-this">鍩烘湰淇℃伅</li>
+                                </ul>
+                                <h1 style="text-align:center;"><b>鐗╂枡璁剧疆</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
 
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 闄勫姞灞炴��1</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSubjoin" lay-verify="HSubjoin" id="HSubjoin" autocomplete="off">
-
-                                </div>
-                            </div>
-
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 闄勫姞灞炴��2</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2" id="HSubjoin2" 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="HColor" lay-verify="HColor" id="HColor" 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="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
-                                </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="HMaterTypeID" id="HMaterTypeID" lay-verify="HMaterTypeID">
-                                                <option value="1" selected>澶栬喘</option>
-                                                <option value="2">鑷埗</option>
-                                                <option value="3">濮斿</option>
-                                            </select>
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <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-xs3">
+                                                    <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-xs3">
+                                                    <label class="layui-form-label">瑙勬牸鍨嬪彿锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HModel" id="HModel" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">鍔╄鐮侊細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <!--<button class="layui-btn" data-type="reload">閫夋嫨</button>-->
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">涓昏閲忓崟浣�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HUnitName" id="HUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HUnitID" id="HUnitID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitList" id="HUnitList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                    <!--<div class="layui-inline">
+                                                        <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+                                                        <div class="layui-input-inline">
+                                                            <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+                                                            <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>-->
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 璁¢噺鍗曚綅缁勶細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">璁¢噺鍗曚綅缁�</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HUnitGroupName" id="HUnitGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HUnitGroupID" id="HUnitGroupID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HUnitGroupList" id="HUnitGroupList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 闄勫姞灞炴��1锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSubjoin" lay-verify="HSubjoin" id="HSubjoin" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 闄勫姞灞炴��2锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSubjoin2" lay-verify="HSubjoin2" id="HSubjoin2" autocomplete="off">
+
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 棰滆壊锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HColor" lay-verify="HColor" id="HColor" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗╂枡鍒嗙被锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HMaterClsID" lay-verify="HMaterClsID" id="HMaterClsID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗╂枡灞炴�э細</label>
+                                                    <div class="layui-input-inline">
+                                                        <div class="layui-form">
+                                                            <div class="layui-form-item">
+                                                                <select name="HMaterTypeID" id="HMaterTypeID" lay-verify="HMaterTypeID">
+                                                                    <option value="1" selected>澶栬喘</option>
+                                                                    <option value="2">鑷埗</option>
+                                                                    <option value="3">濮斿</option>
+                                                                </select>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">榛樿浠撳簱</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿浠撲綅缁勶細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSPGroupID" lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off" value="0">
+
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿浠撲綅锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSPID" lay-verify="HSPID" id="HSPID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿宸ヨ壓璺嚎锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HRoutingID" lay-verify="HRoutingID" id="HRoutingID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 榛樿bom锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HBomID" lay-verify="HBomID" id="HBomID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                            </div>
+                                        </div>
+
+
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <!--<label class="layui-form-label"> 杈呭姪璁¢噺鍗曚綅锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+                                                    </div>-->
+                                                    <div class="layui-inline">
+                                                        <label class="layui-form-label">杈呭姪璁¢噺鍗曚綅</label>
+                                                        <div class="layui-input-inline">
+                                                            <input type="text" readonly name="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <input type="hidden" name="HSecUnitID" id="HSecUnitID" class="layui-input" value="" style="float:left;width:150px;">
+                                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecUnitList" id="HSecUnitList" style="width:40px;">
+                                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鎹㈢畻鐜囷細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
+                                                        <!--<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-xs3">
+                                                    <label class="layui-form-label"> 鏈�楂樺簱瀛橈細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HHighStock" lay-verify="HHighStock" id="HHighStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�浣庡簱瀛橈細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HLowStock" lay-verify="HLowStock" id="HLowStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 瀹夊叏搴撳瓨锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSafeStock" lay-verify="HSafeStock" id="HSafeStock" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閲囪喘鍗曚环锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HOrderPrice" lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 閿�鍞崟浠凤細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HSalePrice" lay-verify="HSalePrice" id="HSalePrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 璁″垝鍗曚环锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HPlanPrice" lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏍囧噯鎴愭湰锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HstdPrice" lay-verify="HstdPrice" id="HstdPrice" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 淇濊川鏈燂細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�灏忓寘瑁呴噺锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鏈�澶ц璐ч噺锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鐗堟湰鍙凤細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HVersion" lay-verify="HVersion" id="HVersion" autocomplete="off">
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑻辨枃鍚嶇О锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HEngName" lay-verify="HEngName" id="HEngName" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
+                                                    </div>
+                                                </div>
+
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
+                                                    <div class="layui-input-inline">
+                                                        <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="layui-form-item">
+                                            <div class="layui-row">
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label"> 澶囨敞锛�</label>
+                                                    <div class="layui-input-inline ">
+                                                        <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+                                                    </div>
+                                                </div>
+                                                <div class="layui-col-xs3">
+                                                    <label class="layui-form-label">绂佺敤鏍囧織锛�</label>
+                                                    <div class="layui-input-inline">
+                                                        <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
+                                                        <input type="hidden" name="UnitType" id="UnitType">
+                                                    </div>
+                                                </div>
+
+                                            </div>
                                         </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="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HWhID" id="HWhID" 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>
-                        <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="HSPGroupID" lay-verify="HSPGroupID" id="HSPGroupID" autocomplete="off" 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="HSPID" lay-verify="HSPID" id="HSPID" autocomplete="off" 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="HRoutingID" lay-verify="HRoutingID" id="HRoutingID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label"> 榛樿bom</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" name="HBomID" lay-verify="HBomID" id="HBomID" autocomplete="off" 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="HSecUnitName" id="HSecUnitName" class="layui-input" value="" style="float:left;width:150px;">
-                                    <input type="hidden" name="HSecUnitID" id="HSecUnitID" 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="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" 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 class="layui-input" name="HHighStock" lay-verify="HHighStock" id="HHighStock" autocomplete="off" 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="HLowStock" lay-verify="HLowStock" id="HLowStock" autocomplete="off" 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="HSafeStock" lay-verify="HSafeStock" id="HSafeStock" autocomplete="off" 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 class="layui-input" name="HOrderPrice" lay-verify="HOrderPrice" id="HOrderPrice" autocomplete="off" 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="HSalePrice" lay-verify="HSalePrice" id="HSalePrice" autocomplete="off" 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="HPlanPrice" lay-verify="HPlanPrice" id="HPlanPrice" autocomplete="off" 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 class="layui-input" name="HstdPrice" lay-verify="HstdPrice" id="HstdPrice" autocomplete="off" 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="HKeepDays" lay-verify="HKeepDays" id="HKeepDays" autocomplete="off" 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="HMinPickQty" lay-verify="HMinPickQty" id="HMinPickQty" autocomplete="off" 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 class="layui-input" name="HQtyMax" lay-verify="HQtyMax" id="HQtyMax" autocomplete="off" 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="HVersion" lay-verify="HVersion" id="HVersion" 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="HEngName" lay-verify="HEngName" id="HEngName" 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="HEngModel" lay-verify="HEngModel" id="HEngModel" 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="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
-                                </div>
-                            </div>
-                            <div class="layui-col-xs4 layui-inline">
-                                <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                <div class="layui-input-inline">
-                                    <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="鏄惁绂佺敤">
-                                    <input type="hidden" name="UnitType" id="UnitType">
-                                </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 ">
-                                    <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
+                    </form>
+                </div>
             </div>
         </div>
     </div>
-
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
 
     <script>
 
@@ -473,7 +531,6 @@
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            debugger;
                             var data = result.data.h_v_Edit_Gy_MaterialList[0];
                             console.log("杩斿洖鐨刣ata.HStopFlag" + JSON.stringify(data.绂佺敤鏍囪));
                             console.log("杩斿洖鐨刣ata.HNoBrushFlag" + JSON.stringify(data.鏄惁鎵撳崱));
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
index 9f2660b..f9f9318 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Unit.html"
@@ -61,7 +61,7 @@
                                                 <div class="layui-col-xs4">
                                                     <label class="layui-form-label">鎹㈢畻姣斿垪锛�</label>
                                                     <div class="layui-input-inline">
-                                                        <input type="text" name="HRate" id="HRate" lay-verify=""  autocomplete="off" class="layui-input">
+                                                        <input type="text" name="HRate" id="HRate" lay-verify="" autocomplete="off" class="layui-input">
 
                                                     </div>
                                                 </div>
@@ -148,8 +148,8 @@
 
             function RoadBillMain(hID)//鍔犺浇琛ㄥご
             {
-                alert(hID);
-                //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+                //alert(hID);
+                // 鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 $.ajax({
                     url: GetWEBURL() + "GetGy_UnitDetail",
                     type: "GET",
@@ -201,7 +201,7 @@
                 $("#HItemID").val(hID);//淇敼鏃朵富琛↖D
                 RoadBillMain(hID);
 
-               /* RoadBillSub(linterid);*/
+                /* RoadBillSub(linterid);*/
             }
             //绂佺敤鏍囧織
             form.on('checkbox(checkboxHStopflag)', function (data) {
@@ -357,11 +357,10 @@
 
             form.on('submit(Cancel)', function () {
                 //sessionStorage["SourceFlag"] = false;
-                if (hID == null || hID==0) {
+                if (hID == null || hID == 0) {
                     parent.location.href = "../../../views/index.html"
                 }
-                else
-                {
+                else {
                     var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
                     parent.layer.close(index); //鍐嶆墽琛屽叧闂�
                 }
@@ -383,7 +382,7 @@
                         success: function (data) {
                             if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                                 layer.msg(data.Message, { icon: 1 });
-                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
+                                $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                             }
                             else {
                                 f_alert(data.Message);
@@ -418,12 +417,12 @@
         });
         //瀹氫箟鍏ㄥ眬鍙橀噺
         var HReasonName, ReasonID, EmpName, SQProcName,
-            ProcID,ZRProcName,QRName
+            ProcID, ZRProcName, QRName
             ;
         function GetHReasonValue(obj)  //杩斿洖涓嶈壇鍘熷洜
         {
-             HReasonName = obj[0].HName;
-             ReasonID = obj[0].HItemID;
+            HReasonName = obj[0].HName;
+            ReasonID = obj[0].HItemID;
         }
         //杩斿洖鐗╂枡
         function GetHMaterNameValue(obj) {  //杩斿洖鐗╂枡
@@ -442,7 +441,7 @@
             $("#HDeptID").val(obj[0].HItemID);
             $("#HDeptNumber").val(obj[0].HNumber);
         }
-         //杩斿洖鍗曚綅
+        //杩斿洖鍗曚綅
         function GetHUnitNameValue(obj) {
             $("#HUName").val(obj[0].HName);
             $("#HUnitID").val(obj[0].HItemID);
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_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/Add_Edit_Gy_Warehouse.html"
new file mode 100644
index 0000000..2b3bb37
--- /dev/null
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Warehouse.html"
@@ -0,0 +1,377 @@
+锘�<!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 type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" 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="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
+                                </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>
+                        <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="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+                                    <input type="hidden" name="HEmpID" id="HEmpID" value="0">
+                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmp-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="text" name="HAddress" id="HAddress" lay-verify="HAddress" autocomplete="off" placeholder="" 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="HPhone" id="HPhone" lay-verify="HPhone" autocomplete="off" placeholder="" class="layui-input">
+                                </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>
+                        <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 id="HItemID" name="HItemID" type="hidden" value="0" />
+                    <input id="HBarCode" name="HBarCode" type="hidden" value="0" />
+                    <input id="HParentID" name="HParentID" type="hidden" value="0" />
+                    <input id="HUpDater" name="HUpDater" type="hidden" value="0" />
+                    <input id="HShortNumber" name="HShortNumber" type="hidden" />
+                </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 sWhere = "";
+            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(HEmp-BT)', function () {
+                get_checkEmp();
+            });
+            ////閫夋嫨鑱屽憳鎸夐挳
+            //form.on('submit(HEmpID-BT)', function () {
+            //    get_checkEmpID();
+            //});
+
+            ////閫夋嫨閮ㄩ棬鎸夐挳
+            //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_Warehouse/cx",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (result) {
+                        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+                            var data = result.data[0];
+                            var IsHStopflag = data.绂佺敤鏍囪;
+                            var IsHTypeFlow = data.鏄庣粏鏍囪;
+                            //绂佺敤鏍囪
+                            if (IsHStopflag) {
+                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
+                            }
+                            //鏄庣粏鏍囪
+                            if (IsHTypeFlow) {
+                                $("input[name='checkboxHTypeFlow'][value='" + IsHTypeFlow + "']").attr("checked", true);
+                            }
+                            form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+                                "HNumber": data.浠撳簱浠g爜
+                                , "HItemID": data.HItemID
+                                , "HParentID": data.HParentID
+                                , "HShortNumber": data.HNumber
+                                , "HName": data.浠撳簱鍚嶇О
+                                , "HHelpCode": data.HHelpCode
+                                , "HEmpID": data.HEmpID
+                                , "HEmpName": data.HEmpName
+                                , "HAddress": data.浠撳簱鍦板潃
+                                , "HPhone": data.鑱旂郴鐢佃瘽
+                                , "HStopflag": data.绂佺敤鏍囪
+                                , "HRemark": data.HRemark
+                                //, "HUseOrg": data.浣跨敤缁勭粐
+                                ////, "HUseOrgID": data.浣跨敤缁勭粐ID
+                                //, "HItemID": data.鏉$爜缂栧彿
+                                , "HBarCode": data.HBarCode
+                                //, "HCreator": data.鍒涘缓浜�
+                                //, "lngBillKey": data.lngBillKey
+                                //, "lngBillSubKey": data.lngBillSubKey
+                                //, "HMaker": data.HMaker
+                                //, "HCreateDate": data.鍒涘缓鏃ユ湡
+                                , "HUpDater": data.HUpDater
+                                //, "HUpDateDate": 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);
+                if (!$("#HNumber").val()) {
+                    layer.msg("璇疯緭鍏ヤ粨搴撲唬鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if (!$("#HName").val()) {
+                    layer.msg("璇疯緭鍏ヤ粨搴撳悕绉帮紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                if ($("#HEmpID").val() == 0) {
+                    layer.msg("璇烽�夋嫨绠$悊鍛橈紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return;
+                }
+                $.ajax({
+                    type: "POST",
+                    url: GetWEBURL() + "Gy_Warehouse/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    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_checkEmp() {
+                layer.open({
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HEmpName").val(checkStatus.data[0].HName);
+                        $("#HEmpID").val(checkStatus.data[0].HItemID);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) { }
+                })
+            }
+            //#endregion
+
+
+            //#region 淇濆瓨鍚庢祻瑙堟柟娉�
+            function ReRoadBillMain() {
+                location.replace('Add_Edit_Gy_Warehouse.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/Add_Edit_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/Add_Edit_Gy_WorkCenter.html"
deleted file mode 100644
index dcef55e..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/Add_Edit_Gy_WorkCenter.html"
+++ /dev/null
@@ -1,305 +0,0 @@
-锘�<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>鏂板/缂栬緫宸ヤ綔涓績</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <style type="text/css">
-        .layui-form-label {
-            width: 85px;
-        }
-    </style>
-</head>
-<body>
-
-    <div id="layout1" class="layui-fluid">
-        <div class="layui-row layui-col-space15">
-            <div class="layui-col-md12">
-                <div class="layui-card">
-                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
-                        <div class="layui-card-header">
-                            <div class="layui-btn-group">
-
-                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
-                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
-
-
-                            </div>
-
-                        </div>
-                        <div class="layui-card-body">
-                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
-                                <div class="layui-tab-content">
-                                    <!--<div class="layui-tab-item layui-show">-->
-                                        <div class="layui-inline">
-
-                                            <label class="layui-form-label">宸ヤ綔涓績浠g爜</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HNumber" lay-verify="HNumber" id="HNumber">
-                                                <input id="HItemID" name="HItemID" type="hidden" />
-                                                <input id="HParentID" name="HParentID" type="hidden" />
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">宸ヤ綔涓績鍚嶇О</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HName" lay-verify="HName" id="HName">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">宸ヤ綔鏃堕棿</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HWorkTimes" lay-verify="HWorkTimes" id="HWorkTimes" value="0">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">鍔╄鐮�</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HHelpCode" lay-verify="HHelpCode" id="HHelpCode" value="0">
-                                                <!--<textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HHelpCode" id="HHelpCode"></textarea>-->
-                                            </div>
-                                        </div>
-                                    <!--</div>-->
-                                    <div class="layui-tab-item layui-show">
-                                        <div class="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-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 class="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-inline">
-                                            <label class="layui-form-label">閮ㄩ棬</label>
-                                            <div class="layui-input-inline">
-                                                <input class="layui-input" name="HDeptID" lay-verify="HDeptID" id="HDeptID" value="0">
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <!--<div class="layui-form-item">-->
-                                        <label class="layui-form-label">澶囨敞</label>
-                                        <div class="layui-input-block">
-                                            <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
-                                        </div>
-                                    <!--</div>-->
-                                    <div class="layui-form-item">
-                                        <label class="layui-form-label">绂佺敤鏍囧織</label>
-                                        <div class="layui-input-block">
-                                            <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
-                                        </div>
-                                    </div>
-                                </div>
-                                </div>
-                            </div>
-                        </div>
-
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
-    <script src="../../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
-    <script>
-//鑾峰彇鍙傛暟
-        function getUrlVars() {
-            var vars = [], hash;
-            var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-            for (var i = 0; i < hashes.length; i++) {
-                hash = hashes[i].split('=');
-                vars.push(hash[0]);
-                vars[hash[0]] = hash[1];
-            }
-            return vars;
-        }
-
-
-
-        var params = getUrlVars();
-        var hID = params[params[0]];//缂栬緫鏌ョ湅
-        var HType = params[params[1]];    //鍗曟嵁鐘舵��
-        var TagParentId = params[params[2]];  //鐖剁骇ID
- 
-
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index' //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
-            var $ = layui.$
-                , admin = layui.admin
-                , layer = layui.layer
-                , table = layui.table
-                , form = layui.form
-                , laydate = layui.laydate
-                , element = layui.element;
-
-            //甯歌鐢ㄦ硶
-
-            //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
-
-
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
-            })
-
-
-
-            form.on('submit(Saver)', function (data) {//淇濆瓨
-                //debugger;
-                var ModRightNameAdd = 'Gy_WorkCenter_Edit';
-                var user = sessionStorage["HUserName"];
-                var arr = new Array();
-                var isEndCheck = document.getElementById("HStopflag").checked;
-                data.field.HStopflag = isEndCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
-               
-                data.field.HItemID = hID == "" ? 0 : hID;
-
-                data.field.HParentID = TagParentId == "" ? 0 : TagParentId;
-                var oMain = JSON.stringify(data.field);
-                
-    
-                var sMainSub = oMain + ';' + hID + ';' + user + ';' + ModRightNameAdd;
-                //console.info(oMain);
-          
-                if (HType == "Modify") {
-
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "/Gy_WorkCenter/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "oMain": sMainSub },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                    });
-                                }
-                                else {
-
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
-                            }
-                        });
-                }
-                else {
-                    $.ajax(
-                        {
-                            type: "POST",
-                            url: GetWEBURL() + "/Gy_WorkCenter/AddBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
-                            async: true,
-                            data: { "oMain": oMain },
-                            dataType: "json",
-                            success: function (data) {
-                                if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
-                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
-                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
-                                    });
-                                }
-                                else {
-
-                                    f_alert(data.Message);
-                                    console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
-                                }
-                                layer.closeAll("loading");
-                            },
-                            error: function (err) {
-
-                                f_alert("閿欒:" + err);
-                                console.log("Reason" + sMainStr);
-                            }
-                        });
-                }
-            });
-            function f_alert(sMsg) {
-                layer.alert(sMsg, { icon: 5 });
-
-            }
-
-            if (HType == "Modify") {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_WorkCenter/xg",
-                    //url: "http://localhost:12761/Gy_Department/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": hID
-                    },
-                    success: function (d) {
-                        console.log(d);
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("input[name='HStopflag']").prop("checked", d.data[0].HStopflag);//true:閫変腑 false:涓嶉�変腑
-                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        $("#HWorkTimes").val(d.data[0].HWorkTimes);//宸ヤ綔鏃堕棿
-                        $("#HQty").val(d.data[0].HQty);//璁惧鏁伴噺
-                        $("#HBarCodeForBase").val(d.data[0].HBarCodeForBase);//鏉″舰鐮�
-                        $("#HDayMoney").val(d.data[0].HDayMoney);//琛屼笟鏍囧噯
-                        $("#HDeptID").val(d.data[0].HDeptID);//閮ㄩ棬
-
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
-            }
-
-
-
-            //鐩戝惉鎻愪氦
-            form.verify({
-                numberOrEmpty: function (value, item) {
-                    // if (value != '') {
-                    if (!/^\d+$/.test(value)) {
-                        return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
-                    }
-                    //}
-                }
-            });
-
-
-        });
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
index c39038d..d54face 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Xt_ORGANIZATIONSList.html"
@@ -78,6 +78,7 @@
                         </div>
 
                     </div>
+                    <input type="hidden" value="0" name="HParentID" id="HParentID">
                 </form>
             </div>
         </div>
@@ -241,7 +242,7 @@
                     type: "POST",
                     url: GetWEBURL() + "Xt_ORGANIZATIONS/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
-                    data: { "msg": sMainStr },
+                    data: { "oMain": sMainStr },
                     dataType: "json",
                     success: function (data) {
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
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 f835bcd..3348dba 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"
@@ -25,45 +25,44 @@
                         <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-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>
+                                <!--<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-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="treeCurrency" lay-filter="treeCurrency" 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 class="layui-row" style="padding:10px 0">-->
+                                <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                    <div id="treeCurrency" lay-filter="treeCurrency" 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">
@@ -96,7 +95,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
                             </div>
                         </script>
                     </form>
@@ -140,9 +139,9 @@
                         elem: '#treeCurrency',
                         data: treeData,
                         id: 'treeId',
-                        disabled:'disabled',
+                        disabled: 'disabled',
                         showCheckbox: false,     //鏄惁鏄剧ず澶嶉�夋
-                        showLine:false
+                        showLine: false
                     });
                 }
             });
@@ -337,8 +336,8 @@
                                 }
                             }
                         })
-                        
-                        
+
+
 
                         layer.close(index); //鍏抽棴寮瑰眰
                     }
@@ -386,7 +385,7 @@
                     }
                 });
             });
-            //#endregion 
+            //#endregion
 
             //#region 鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
@@ -407,7 +406,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 });
                         }
@@ -453,4 +452,4 @@
     </script>
 
 </body>
-</html>
+</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_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"
index 0b9af58..db1cd97 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_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"
@@ -45,11 +45,11 @@
                         <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>-->
+                                <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>
@@ -66,7 +66,7 @@
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
 
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -78,18 +78,18 @@
             var sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];
             var option = [];
 
-        //#endregion
+            //#endregion
 
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
-        //#endregion
+            //#endregion
 
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //#region 澶村伐鍏锋爮浜嬩欢
             table.on('toolbar(mainTable)', function (obj) {
@@ -128,10 +128,10 @@
             });
             //#endregion
 
-        //#endregion
+            //#endregion
 
 
-        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
@@ -190,80 +190,6 @@
             }
             //#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();
@@ -278,6 +204,131 @@
                 sWhere = "and HUSEORGID=" + sessionStorage["OrganizationID"];//璋冪敤鎺ュ彛鍚庢竻绌簊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_Department.html?OperationType=3&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();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_Department',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
+                }
+                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 set_ClearQuery() {
+            //    $("#HNumber").val("");
+            //    $("#HName").val("");
+            //    sWhere = "";
+            //}
+            ////#endregion
+
+
 
             //#region 閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
@@ -295,7 +346,7 @@
                     , area: ['100%', '100%']
                     , title: '鐢熶骇璧勬簮-鏂板'
                     , shift: 0//寮瑰嚭鍔ㄧ敾
-                    , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
+                    , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Department.html?OperationType=1&linterid=&HSouceBillType='
                 })
             }
             //#endregion
@@ -307,12 +358,12 @@
             }
             //#endregion
 
-        
 
 
-        //浠ヤ笂鏄痩ayui妯″潡
+
+            //浠ヤ笂鏄痩ayui妯″潡
         });
-        //#endregion
+            //#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_Department_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_Department_Edit.html"
deleted file mode 100644
index 7e62e9f..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_Edit.html"
+++ /dev/null
@@ -1,490 +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/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" style="padding: 0;">
-        <div class="layui-card" style="padding: 15px;background-color: #efefef;">
-            <div class="layui-card-body" style="padding: 1px;">
-                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <!--<div class="maintitle">閮ㄩ棬</div>-->
-                    <div style="padding: 10px;">
-                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Saver" id="Saver">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">淇濆瓨</span></i>
-                        </button>-->
-                        <!--<button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Add" id="Add">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鏂板</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Check" id="Check">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">瀹℃牳</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="FCheck" id="FCheck">
-                            <i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"><span class="btn-title">鍙嶅鏍�</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">
-                            <i class="layui-icon layui-icon-close layuiadmin-button-btn"><span class="btn-title">閫�鍑�</span></i>
-                        </button>
-                        <button class="layui-btn layuiadmin-btn-order main-btn" type="button" lay-submit="" lay-filter="print" id="print">
-                            <i class="layui-icon layui-icon-close layuiadmin-button-btn"><span class="btn-title">鎵撳嵃</span></i>
-                        </button>-->
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
-                    </div>
-                    <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input"value="瀹佹尝鍥涚淮灏�">
-                                    <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
-                                </div>
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input"value="瀹佹尝鍥涚淮灏�">
-                                    <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
-                                </div>
-                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">缂栫爜</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">鍚嶇О</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="layui-row">
-                            <div class="layui-inline"style="width: 56%;">
-                                <label class="layui-form-label">澶囨敞</label>
-                                <div class="layui-input-inline"style="width: 56%;">
-                                    <input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                        <!--<div class="title">鍩烘湰淇℃伅</div>-->
-                        <div class="layui-tab" lay-filter="tab-POStockInBill">
-                            <ul class="layui-tab-title" lay-filter="tab-all">
-                                <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                                <li lay-id="2" style="padding:1px;">鍏朵粬</li>
-                            </ul>
-                            <div class="layui-tab-content">
-                                <!--鍩烘湰淇℃伅-->
-                                <div class="layui-tab-item layui-show">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鏉″舰鐮�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍔╄鐮�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">璐熻矗浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HSecManager" id="HSecManager" lay-verify="HSecManager" autocomplete="off" class="layui-input">
-                                                    <input type="hidden" name="HSecManagerID" id="HSecManagerID" lay-verify="HSecManagerID" value="0" autocomplete="off" class="layui-input">
-                                                </div>
-                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerID-BT">...</button>
-                                                </div>
-                                            </div>
-                                        </div>
-                                </div>
-                                <!--鍏朵粬淇℃伅-->
-                                <div class="layui-tab-item ">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                            <!--<di-->
-                            <!--v class="layer-footer" style="text-align: center;">
-
-
-        </div>-->
-                            <!--闅愯棌瀛楁-->
-                            <input type="hidden" name="lngBillKey" id="lngBillKey">
-                            <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-                            <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
-</form>
-            </div>
-        </div>
-    </div>
-    <script>
-        layui.config({
-            base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
-        }).extend({
-            index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['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
-            var sWhere = "";
-
-
-            $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
-
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
-            }
-
-            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var HType = params[params[1]];    //鍗曟嵁鐘舵��
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-
-
-            if (HType == "Modify") {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Department/xg",
-                    //url: "http://localhost:12761/Gy_Department/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
-            }
-            else {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Department/GetMAXBillID",
-                    type: "GET",
-                    data: { },
-                    success: function (d) {
-                        $("#HInterID").val(d.data[0].hitemid);
-                    }
-                });
-                //Initialization();
-            }
-
-
-            //閫夋嫨楠屾敹
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-                var sMainStr = JSON.stringify(data.field);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '楠屾敹鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            ////閫夋嫨鍒涘缓缁勭粐
-            //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-            //    var sMainStr = JSON.stringify(data.field);
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '缁勭粐'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-
-
-            //鑾峰彇鏈�澶у熀纭�璧勬枡ID
-            $.ajax({
-                url: GetWEBURL() + "/Gy_Department/GetMAXBillID",
-                type: "GET",
-                data: { },
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].hitemid);
-                }
-            });
-
-            //鎵撳嵃Printing
-            form.on("submit(print)", function (data) {
-                layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
-                //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-
-            });
-
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-                $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-            });
-
-            //瀹℃牳
-            form.on('submit(Check)', function () {
-                
-            });
-
-
-            //閫�鍑�
-            form.on('submit(Cancel)', function () {
-                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
-                });
-            });
-
-
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-
-                var HCreateOrg = $("#HCreateOrg").val();
-                if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
-
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HCreateOrgID = $("#HCreateOrgID").val();
-                if (HCreateOrgID == null || HCreateOrgID == undefined || HCreateOrgID == "") {
-
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HUseOrg = $("#HUseOrg").val();
-                if (HUseOrg == null || HUseOrg == undefined || HUseOrg == "") {
-
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HUseOrgID = $("#HUseOrgID").val();
-                if (HUseOrgID == null || HUseOrgID == undefined || HUseOrgID == "") {
-
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HNumber = $("#HNumber").val();
-                if (HNumber == null || HNumber == undefined || HNumber == "") {
-
-                    layer.msg("璇疯緭鍏ラ儴闂ㄧ紪鐮侊紒", { icon: 5 });
-                    return;
-
-                }
-                var HName = $("#HName").val();
-                if (HName == null || HName == undefined || HName == "") {
-
-                    layer.msg("璇疯緭鍏ラ儴闂ㄥ悕绉帮紒", { icon: 5 });
-                    return;
-
-                }
-                var ModRightNameAdd = 'Gy_Department_Edit';
-                var user = sessionStorage["HUserName"];
-
-
-                var oMain = JSON.stringify(data.field)
-                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Department/AddBill1",
-                        //url: "http://localhost:12761/Gy_Department/AddBill1",
-                        async: true,
-                        data: { "oMain": sBillModeify},
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("淇濆瓨鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-                else
-                {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Department/AddBill",
-                        //url: "http://localhost:12761/Gy_Department/AddBill",
-                        async: true,
-                        data: { "oMain": oMain },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("鎻愪氦鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
-                }
-            });
-
-
-
-        });
-        //浠ヤ笂涓簂ayui妯″潡
-
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-
-
-
-
-
-    </script>
-
-</body>
-</html>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 5e4322a..445a1fe 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,11 +22,7 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
+                                
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鑱屽憳浠g爜</label>
                                     <div class="layui-input-block">
@@ -192,7 +188,8 @@
                         , { field: '鐝粍浠g爜', title: '鐝粍浠g爜', sort: true}
                         , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', sort: true }
                         , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: true}
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪', sort: true }
+                        , { field: '澶囨敞', title: '澶囨敞' }
                     ]]
                 };
             }
@@ -235,7 +232,7 @@
                     shift: 2,
                     area: ['100%', '100%'],
                     maxmin: true,
-                    content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html',
+                    content: '../鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html',
                     end: function () {
                         //鍒锋柊椤甸潰,
                         get_FastQuery(table, option);
@@ -261,7 +258,7 @@
                         , shade: 0.6 //閬僵閫忔槑搴�
                         , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                         , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Employee.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , content: '../鍏敤鍩虹璧勬枡/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                         , resize: false
                         , cancel: function () {
                             //$(".layui-btn").removeClass("layui-btn-disabled");
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"
index 588dff0..c430238 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_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"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫鐢熶骇璧勬簮</title>
+    <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">
@@ -19,6 +19,7 @@
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         .layui-form-label {
             width: 25%;
         }
@@ -36,297 +37,538 @@
                             <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 class="layui-tab" lay-filter="tab-POStockInBill">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬淇℃伅</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <!--鍩烘湰淇℃伅-->
+                                <div class="layui-form-item">
+                                    <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 type="text" name="HDutyName" id="HDutyName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDutyID" id="HDutyID" value="0">
+                                                <input type="hidden" name="HDutyNumber" id="HDutyNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDutyID-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="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" id="HAge" lay-verify="HAge" autocomplete="off" class="layui-input">
+                                            </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" id="HBlighty" lay-verify="HBlighty" 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="HNation" id="HNation" lay-verify="HNation" 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">
+                                                <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" id="HArchivesNo" lay-verify="HArchivesNo" 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="HProTitleID" id="HProTitleID" lay-verify="HProTitleID" 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" id="HSalaryLev" lay-verify="HSalaryLev" autocomplete="off" class="layui-input">
+                                            </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="HGradSchool" id="HGradSchool" lay-verify="HGradSchool" 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="HGradDate" id="HGradDate" lay-verify="HGradDate" 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="HDormName" id="HDormName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HDormID" id="HDormID" value="0">
+                                                <input type="hidden" name="HDormNumber" id="HDormNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div class="layui-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="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" id="HSpec" lay-verify="HSpec" autocomplete="off" class="layui-input">
+                                            </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="HNowAdd" id="HNowAdd" autocomplete="off" style=" width: 90%;">
+                                            </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" id="HEmail" lay-verify="HEmail" autocomplete="off" class="layui-input">
+                                            </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="HHomeAdd" id="HHomeAdd" autocomplete="off" style=" width: 90%;">
+                                            </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" id="HPostalCode" lay-verify="HPostalCode" autocomplete="off" class="layui-input">
+                                            </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="HOldCompany" id="HOldCompany" autocomplete="off" style=" width: 90%;">
+                                            </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" id="HLinkPhone" lay-verify="HLinkPhone" autocomplete="off" class="layui-input">
+                                            </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="HMobilePhone" id="HMobilePhone" lay-verify="HMobilePhone" 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">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item">
+                                                        <select name="HWorkType" id="HWorkType" lay-verify="HWorkType">
+                                                            <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="HWorkTypeName" id="HWorkTypeName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HWorkTypeID" id="HWorkTypeID" value="0">
+                                                <input type="hidden" name="HDormNumber" id="HDormNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">杩涘巶鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HInComDate" id="HInComDate" lay-verify="HInComDate" 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="HRelDate" id="HRelDate" lay-verify="HRelDate" 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="HInsuranceNo" id="HInsuranceNo" lay-verify="HInsuranceNo" autocomplete="off" class="layui-input">
+                                            </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="HInsuranceStatus" id="HInsuranceStatus" lay-verify="HInsuranceStatus">
+                                                            <option value="true">鏄�</option>
+                                                            <option value="false">鍚�</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="HInsuranceDate" id="HInsuranceDate" lay-verify="HInsuranceDate" 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="HContractEDate" id="HContractEDate" lay-verify="HContractEDate" autocomplete="off" class="layui-input">
+                                            </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="HContractBDate" id="HContractBDate" lay-verify="HContractBDate" 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="HContractYear" id="HContractYear" lay-verify="HContractYear " 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="HDimissionDate" id="HDimissionDate" lay-verify="HDimissionDate" autocomplete="off" class="layui-input">
+                                            </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="HStayCardEDate" id="HStayCardEDate" lay-verify="HStayCardEDate" 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="HCTPrjName" id="HCTPrjName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HCTPrjID" id="HCTPrjID" value="0">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCTPrjID-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="text" name="HEmpRate" id="HEmpRate" lay-verify="HEmpRate" autocomplete="off" class="layui-input">
+                                            </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">
+                                                <input type="hidden" name="HDepNumber" id="HDepNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-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="text" name="HPostName" id="HPostName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HPostID" id="HPostID" value="0">
+                                                <input type="hidden" name="HPostNumber" id="HPostNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">鐝粍</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">
+                                                <input type="hidden" name="HGroupNumber" id="HGroupNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-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="text" name="BSTDeptName" id="BSTDeptName" class="layui-input" value="" style="float:left;width:150px;">
+                                                <input type="hidden" name="BSTDeptID" id="BSTDeptID" value="0">
+                                                <input type="hidden" name="BSTDeptNumber" id="BSTDeptNumber" value="">
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkTypeID-BT" style="width:40px;">
+                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-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: 90%;">
+                                            </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="HDimissionReason" id="HDimissionReason" autocomplete="off" style=" width: 90%;">
+                                            </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="HFax" id="HFax" lay-verify="HFax " 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">
+                                                <div class="layui-form">
+                                                    <div class="layui-form-item">
+                                                        <select name="HSignStatus" id="HSignStatus" lay-verify="HSignStatus">
+                                                            <option value="true">鏄�</option>
+                                                            <option value="false">鍚�</option>
+                                                        </select>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </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="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 class="layui-tab-item">
+                                <!--鍏朵粬淇℃伅-->
+                                <div class="layui-form-item">
+                                    <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="HIDCard" id="HIDCard" autocomplete="off" style=" width: 75%;">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">涓嶆墦鍗�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHNoBrushFlag" id="checkboxHNoBrushFlag" lay-skin="primary" lay-filter="checkboxHNoBrushFlag" value="true" title="鏄惁鎵撳崱">
+                                                <input type="hidden" value="false" name="HNoBrushFlag" id="HNoBrushFlag">
+                                            </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 class="layui-col-xs4 layui-inline">
+                                            <label class="layui-form-label">璋冧紤鏍囧織</label>
+                                            <div class="layui-input-inline">
+                                                <input type="checkbox" name="checkboxHOverType" id="checkboxHOverType" lay-skin="primary" lay-filter="checkboxHOverType" value="true" title="鏄惁璋冧紤">
+                                                <input type="hidden" value="false" name="HOverType" id="HOverType">
+                                            </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="HEmpType" id="HEmpType" lay-verify="HEmpType">
+                                                            <!--<option value="鐢�">鐢�</option>
+                                <option value="濂�">濂�</option>-->
+                                                        </select>
+                                                    </div>
+                                                </div>
+
+                                            </div>
                                         </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>
@@ -408,25 +650,17 @@
                 $("#HStopflag").val(data.elem.checked);
             });
 
-            //閫夋嫨宸ュ簭鎸夐挳
-            form.on('submit(HProc-BT)', function () {
-                get_checkProc();
+            //閫夋嫨鑱屽姟鎸夐挳
+            form.on('submit(HDutyID-BT)', function () {
+                get_checkDuty();
             });
 
-            //閫夋嫨閮ㄩ棬鎸夐挳
-            form.on('submit(HDepart-BT)', function () {
-                get_checkDept();
+            //閫夋嫨瀹胯垗鎸夐挳
+            form.on('submit(HDormID-BT)', function () {
+                get_checkDorm();
             });
 
-            //閫夋嫨宸ヤ綔涓績鎸夐挳
-            form.on('submit(HWorkingProcedure-BT)', function () {
-                get_checkWorkCenter();
-            });
-
-            //閫夋嫨鐝粍鎸夐挳
-            form.on('submit(ProductionTeam-BT)', function () {
-                get_checkGroup();
-            });
+          
 
             //淇濆瓨鎸夐挳
             form.on('submit(set_SaveBill)', function (data) {
@@ -453,41 +687,54 @@
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
-                    url: GetWEBURL() + "GetGy_SourceDetail",
+                    url: GetWEBURL() + "GetGy_EmployeeDetail",
                     type: "GET",
                     data: {
                         "HID": linterid
                     },
                     success: function (result) {
                         if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-                            var data = result.data.h_v_Edit_IF_SourceList[0];
+                            var data = result.data.h_v_Edit_IF_EmployeeList[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爜
+                                "HNumber": data.鑱屽憳浠g爜
                                 , "HItemID": data.HItemID
-                                , "HName": data.鐢熶骇璧勬簮鍚嶇О
+                                , "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爜
+                                , "HDutyName": data.鑱屽姟
+                                , "HDutyID": data.鑱屽姟ID
+                                , "HDutyNumber": data.鑱屽姟浠g爜
+                                , "HSex": data.鎬у埆
+                                , "HBirthDay": data.鍑虹敓骞存湀
+                                , "HAge": data.骞撮緞
+                                , "HBlighty": data.绫嶈疮
+                                , "HNation": data.姘戞棌
+                                , "HBlightyType": data.鎴风睄绫诲埆
+                                , "HGovStatus": data.鏀挎不闈㈣矊
+                                , "HKnowLev": data.瀛﹀巻
+                                , "HMarr": data.濠氬Щ鐘跺喌
+                                , "HArchivesNo": data.妗f缂栧彿
+                                , "HProTitleID": data.鑱岀О
+                                , "HSalaryLev": data.钖祫绛夌骇
+                                , "HGradSchool": data.姣曚笟瀛︽牎
+                                , "HGradDate": data.姣曚笟鏃堕棿
+                                , "HDormName": data.瀹胯垗
+                                , "HDormID": data.瀹胯垗ID
+                                , "HDormNumber": data.瀹胯垗浠g爜
+                                , "HEngLev": data.澶栬姘村钩
+                                , "HCompLev": data.璁$畻鏈烘按骞�
+                                , "HSpec": data.涓撲笟
+                                , "HNowAdd": data.鐜颁綇鍦板潃
+                                , "HEmail": data.鐢靛瓙閭
+                                , "HHomeAdd": data.瀹跺涵鍦板潃
+                                , "HPostalCode": data.閭斂缂栫爜
+                                , "HOldCompany": data.鍘熷叕鍙�
+                                , "HLinkPhone": data.鑱旂郴鐢佃瘽
                                 , "HStopflag": data.绂佺敤鏍囪
-                                , "HType": data.绫诲瀷
                                 , "HRemark": data.澶囨敞
                             });
                             layer.close(ajaxLoad);
@@ -508,7 +755,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "SaveGy_SourceList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "SaveGy_EmployeeList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "msg": sMainStr },
                     dataType: "json",
@@ -531,16 +778,15 @@
                 });
             }
             //#endregion
-
-            //#region 閫夋嫨宸ュ簭鏂规硶
-            function get_checkProc() {
+            //#region 閫夋嫨鑱屽姟鏂规硶
+            function get_checkDuty() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '宸ュ簭鍒楄〃'//鏍囬
+                    , title: '鑱屽姟鍒楄〃'//鏍囬
                     , shift: 2//寮瑰嚭鍔ㄧ敾
-                    , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -548,9 +794,9 @@
                         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爜);
+                        $("#HDutyName").val(checkStatus.data[0].鑱屽姟);
+                        $("#HDutyID").val(checkStatus.data[0].HItemID);
+                        $("#HDutyNumber").val(checkStatus.data[0].鑱屽姟浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -558,41 +804,32 @@
             }
             //#endregion
 
-            //#region 閫夋嫨閮ㄩ棬鏂规硶
-            function get_checkDept() {
+            ////#region 閫夋嫨鑱屽姟
+            //form.on('submit(HDutyID-BT)', function () {//閫夋嫨鑱屽姟
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '鑱屽姟鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
+            //#region 閫夋嫨瀹胯垗鏂规硶
+            function get_checkDorm() {
                 layer.open({
                     type: 2//寮圭獥绫诲瀷
                     , skin: 'layui-layer-rim' //鍔犱笂杈规
                     , area: ['90%', '90%']//澶у皬
-                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , 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']
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
                     , btn: ['纭畾', '鍙栨秷']
                     , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
                         var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
@@ -600,8 +837,9 @@
                         if (checkStatus.data.length === 0) {
                             return layer.msg('璇烽�夋嫨鏁版嵁');
                         }
-                        $("#HCenter").val(checkStatus.data[0].宸ヤ綔涓績);
-                        $("#HCenterID").val(checkStatus.data[0].HItemID);
+                        $("#HDormName").val(checkStatus.data[0].瀹胯垗);
+                        $("#HDormID").val(checkStatus.data[0].HItemID);
+                        $("#HDormNumber").val(checkStatus.data[0].瀹胯垗浠g爜);
                         layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
                     , btn2: function (index, layero) { }
@@ -609,34 +847,29 @@
             }
             //#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 閫夋嫨瀹胯垗
+            //form.on('submit(HDormID-BT)', function () {//閫夋嫨瀹胯垗
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '瀹胯垗鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
+
+          
 
             //#region 淇濆瓨鍚庢祻瑙堟柟娉�
             function ReRoadBillMain() {
-                location.replace('Add_Edit_Gy_Source.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
+                location.replace('Gy_Employee_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);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
             }
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 0d409c1..3ee2c24 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"
@@ -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,7 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -19,18 +19,18 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
+                                <!--<div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
-                                        <span>鏇村</span>
+                                        <span></span>
                                     </div>
-                                </div>
+                                </div>-->
                                 <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">
+                                    <!--</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">
@@ -41,34 +41,28 @@
                                     <div class="layui-input-block">
                                         <input type="text" class="layui-input" name="HModel" id="HModel">
                                     </div>
-
+                                    <!--</div>
+                                    <div class="layui-inline">-->
+                                    <label class="layui-form-label">缁勭粐鍚嶇О</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
+                                    </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                     <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                 </button>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                <div class="layui-colla-content">
-                                    <div class="layui-inline">
-                                        <div class="layui-inline">
-                                            <span>鍏朵粬鏉′欢></span>
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label">缁勭粐鍚嶇О</label>
-                                        <div class="layui-input-block">
-                                            <input type="text" class="layui-input" name="HOrgName" id="HOrgName">
-                                        </div>
-                                    </div>
-                                </div>
+
                             </div>
                         </div>
                         <table class="" id="mainTable" lay-filter="mainTable"></table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" 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-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layui-icon layui-icon-form"></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="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></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>
@@ -88,17 +82,17 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-            //#region 鍏敤鍙橀噺 
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
             var sWhere = "";
-          
+
             var option = [];
             //#endregion
 
@@ -107,7 +101,7 @@
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
-             //#endregion
+            //#endregion
 
             //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
@@ -124,6 +118,9 @@
                         break;
                     case 'btn-Delete':
                         set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
                         break;
                     //瀹℃牳鎸夐挳
                     case 'btn-Audit':
@@ -147,10 +144,7 @@
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#HModel").val("");
-                $("#HOrgName").val("");
+                set_ClearQuery();
                 //$("#btnSearch").click();
             });
             //#endregion
@@ -161,7 +155,7 @@
             });
             //#endregion
 
-         //#endregion
+            //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
@@ -204,6 +198,16 @@
             }
             //#endregion
 
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#HModel").val("");
+                $("#HOrgName").val("");
+                sWhere = "";
+            }
+            //#endregion
             //#region 鏌ヨ
             function get_Display(sWhere) {
                 var wait = layer.load();//閬僵
@@ -343,6 +347,12 @@
                 }
             }
             //#endregion
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
 
             //#region 棰勮
             function get_PrintReport() {
@@ -360,8 +370,8 @@
             }
             //#endregion
         });
-        //#endregion
+            //#endregion
     </script>
 
 </body>
-</html>
+</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_Unit.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_Unit.html"
index add8e6e..b50d472 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_Unit.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_Unit.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,7 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -19,11 +19,7 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
+
                                 <!--<div style="padding: 10px;">
                                     <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="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>
@@ -32,38 +28,48 @@
                                     <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="treeunit" lay-filter="treeunit" 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" style="padding:10px 0">-->
+                                <!--<div class="layui-col-xs3 layui-inline" style="width: 23%;">
+                                    <div id="treeunit" lay-filter="treeunit" 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" 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>
+                                <!--<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>-->
+                                <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>
@@ -129,7 +135,7 @@
                 , cellMinWidth: 90
                 , cols: [[
                     { type: 'checkbox', fixed: 'left' }
-                    ,{ field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                     , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜' }
                     , { field: '璁¢噺鍗曚綅鍚嶇О', title: '璁¢噺鍗曚綅鍚嶇О' }
                     , { field: '榛樿鏍囪', title: '榛樿鏍囪' }
@@ -240,6 +246,7 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                var ajaxLoad = layer.load();
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -256,11 +263,14 @@
                         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 });
                     }
                 });
@@ -285,4 +295,4 @@
     </script>
 
 </body>
-</html>
+</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_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 74d130d..390c345 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"
@@ -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,7 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -19,11 +19,11 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
+                                <!--<div class="layui-colla-title layui-inline">
                                     <div class="layui-inline">
                                         <span></span>
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="layui-inline">
                                     <label class="layui-form-label">浠撳簱浠g爜</label>
                                     <div class="layui-input-block">
@@ -46,14 +46,16 @@
                         <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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+                                <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="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="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"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
 
                             </div>
                         </script>
@@ -72,34 +74,46 @@
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
             var sWhere = "";
             var option = [];
-        //#endregion
+            //#endregion
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒濆鍖栫晫闈�
             set_ClearBill();
 
-        //#endregion
+            //#endregion
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#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_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
                         break;
 
                 };
@@ -120,9 +134,9 @@
             });
             //#endregion
 
-        //#endregion
+            //#endregion
 
-        //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+            //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
 
             //#region 鍒濆鍖栫晫闈�
             function set_ClearBill() {
@@ -155,8 +169,11 @@
             }
             //#endregion
 
+
+
             //#region 鏌ヨ
             function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
                 $.ajax({
                     //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Gy_Warehouse/list',
@@ -166,11 +183,14 @@
                         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 });
                     }
                 });
@@ -192,6 +212,29 @@
             }
             //#endregion
 
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
+
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '浠撳簱鍒楄〃-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
             //#region 缂栬緫
             function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
@@ -204,7 +247,7 @@
                         , area: ['100%', '100%']
                         , title: '浠撳簱鍒楄〃-缂栬緫'
                         , shift: 0//寮瑰嚭鍔ㄧ敾
-                        , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Warehouse.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                     })
                 } else {
                     layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -212,8 +255,59 @@
             }
             //#endregion
 
+            //#region 鍒犻櫎
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_Warehouse',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
+                            }
+                        });
+                    })
 
-        //#endregion 
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
+
+            //#endregion
 
             //浠ヤ笂鏄痩ayui妯″潡
         });
@@ -222,4 +316,4 @@
     </script>
 
 </body>
-</html>
+</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_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 15df35c..9731bdc 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"
@@ -8,11 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <style media="screen">
-        /*.custom-tree-item-clicked {
-            color: #FC9003
-        }*/
-    </style>
+    <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>
@@ -21,86 +21,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-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-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>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
+                        <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-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 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>
-                            <!--</div>
-                        </div>-->
-                        <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
+                                <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="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="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>
@@ -109,15 +57,8 @@
             </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 = "";
         var TagParentId = "";
@@ -138,7 +79,8 @@
                 , util = layui.util
                 , tree = layui.tree
                 , util = layui.util
-                  var sWhere = "";
+            var sWhere = "";
+            var option = [];
             //#endregion
 
             //#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -153,8 +95,23 @@
             //#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;
                 };
             });
@@ -163,9 +120,7 @@
 
             //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                //$("#btnSearch").click();
+                set_ClearQuery();
             });
             //#endregion
 
@@ -174,60 +129,61 @@
                 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");
-                            }
-                        })
 
-                    } else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
-                }
-            });
-                //#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");
+            //                }
+            //            })
+
+            //        } else {
+            //            layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+            //        }
+            //    }
+            //});
+            //#endregion
             //#endregion
 
             //#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -243,7 +199,7 @@
 
             //#region 鍒濆鍖栬〃鏍兼柟娉�
             function set_InitGrid() {
-               option = {
+                option = {
                     elem: '#mainTable'
                     , toolbar: '#toolbarDemo'
                     , height: 'full-50'
@@ -309,30 +265,28 @@
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
             }
             //#endregion
-           
-            //#region 鏂板
-            form.on('submit(btnAdd)', function (obj) {
-                //椤甸潰灞�-鑷畾涔�
-                layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鏂板宸ヤ綔涓績',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['90%', '90%'],
-                    maxmin: true,
-                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_WorkCenter.html?hID=' + TagId + ''],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
 
-                    }
-                });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
             //#endregion
+
+            //#region 鏂板
+            function set_AddNew() {
+                layer.open({
+                    type: 2
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['100%', '100%']
+                    , title: '宸ヤ綔涓績-鏂板'
+                    , shift: 0//寮瑰嚭鍔ㄧ敾
+                    , content: '../鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+                })
+            }
+            //#endregion
+
 
             //#region 缂栬緫
             function set_ShowBill() {
@@ -355,87 +309,59 @@
             //#endregion
 
             //#region 鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_WorkCenter_Delete'
-                if (TagId != "") {
-                    layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                        btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                        , yes: function (index, layero) {
-
-                            $.ajax({
-                                url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
-                                type: "GET",
-                                //async: true,
-                                data: { "HItemID": TagId, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                success: function (result) {
-                                    if (result.count == 1) {
-                                        layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                            // 寰楀埌frame绱㈠紩
-                                            var index = layer.getFrameIndex(window.name);
-                                            //鍏抽棴褰撳墠frame
-                                            layer.close(index);
-                                            //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                            window.location.reload();
-                                            //閲嶈浇tree
-                                            tree.reload('treeDepartment', {});
-                                        });
-
-                                    } else {
-                                        layer.alert(result.code + result.Message, { icon: 5 });
-                                    }
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ItemID = data[0].HItemID.toString();
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        var wait = layer.load();
+                        //閫昏緫鍒犻櫎鏂规硶
+                        $.ajax({
+                            url: GetWEBURL() + 'DeltetGy_WorkCenter',
+                            type: "GET",
+                            data: { "HItemID": ItemID },
+                            success: function (result) {
+                                console.log('gouba' + result);
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(wait);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                    layer.close(wait);
                                 }
-                            })
-                        }
-                    });
-                }
-                else {
-                    //var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    //    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                    var checkStatus = table.checkStatus('mainTable')
-                        , data = checkStatus.data;
-                    var layEvent = checkStatus.event;
-                    if (checkStatus.data.length === 1) {
-                        layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                            btn: ['纭畾', '鍙栨秷'] //鎸夐挳
-                            , yes: function (index, layero) {
-
-                                $.ajax({
-                                    url: GetWEBURL() + '/Gy_WorkCenter/Delete_Json',
-                                    type: "GET",
-                                    //async: true,
-                                    data: { "HItemID": data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                                    success: function (result) {
-                                        if (result.count == 1) {
-                                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
-                                                // 寰楀埌frame绱㈠紩
-                                                var index = layer.getFrameIndex(window.name);
-                                                //鍏抽棴褰撳墠frame
-                                                layer.close(index);
-                                                //淇敼涓哄姛鍚庡埛鏂扮晫闈�
-                                                window.location.reload();
-                                                //閲嶈浇tree
-                                                tree.reload('treeDepartment', {});
-                                            });
-
-                                        } else {
-                                            layer.alert(result.code + result.Message, { icon: 5 });
-                                        }
-                                    }
-                                })
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                                layer.close(wait);
                             }
                         });
-                    }
-                    else {
-                        layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
-                    }
+                    })
                 }
-            });
-                //#endregion
-            
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+
+            }
+            //#endregion
+
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
+
+
             //浠ヤ笂鏄痩ayui妯″潡
         });
-        //#endregion
+            //#endregion
     </script>
 
 </body>
-</html>
+</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_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"
index 4a046f2..ab1bf04 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_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"
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>鏂板/缂栬緫鐢熶骇璧勬簮</title>
+    <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">
@@ -19,6 +19,7 @@
             margin-bottom: 5px;
             margin-right: 0px;
         }
+
         .layui-form-label {
             width: 25%;
         }
@@ -43,7 +44,6 @@
                                 <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">
@@ -129,7 +129,7 @@
             index: 'lib/index' //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
 
-        //#region 鍏敤鍙橀噺
+            //#region 鍏敤鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -141,10 +141,10 @@
             var month = date.getMonth() + 1;
             var year = date.getFullYear();
             var shijian = year + "-" + month + "-" + day;
-        //#endregion
+            //#endregion
 
 
-        //#region 杩涘叆椤甸潰鍗冲姞杞�
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
 
             //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             get_LoginIs();
@@ -177,10 +177,10 @@
                 layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
 
-        //#endregion
+            //#endregion
 
 
-        //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
 
             //閫�鍑烘寜閽�
             form.on('submit(Cancel)', function () {
@@ -217,10 +217,10 @@
                 set_SaveBill(data);
             });
 
-        //#endregion
+            //#endregion
 
 
-        //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
             //#region 鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
             function get_LoginIs() {
@@ -233,7 +233,7 @@
             //#endregion
 
             //#region 鍔犺浇琛ㄥご
-            function RoadBillMain(linterid){
+            function RoadBillMain(linterid) {
                 //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
                 var ajaxLoad = layer.load();
                 $.ajax({
@@ -295,7 +295,7 @@
                 var sMainStr = JSON.stringify(data.field);
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "Gy_WorkCenter/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
                     data: { "oMain": sMainStr },
                     dataType: "json",
@@ -304,7 +304,7 @@
                             layer.msg(data.Message, { icon: 1 });
                             $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                             //淇濆瓨鍚庢祻瑙�
-                            ReRoadBillMain();
+                            //ReRoadBillMain();
                         }
                         else {
                             layer.alert(data.Message, { icon: 5 });
@@ -313,7 +313,7 @@
                     },
                     error: function (err) {
                         layer.alert("閿欒:" + err, { icon: 5 });
-                        console.log("Reason" + sMainStr);
+                        //console.log("Reason" + sMainStr);
                     }
                 });
             }
@@ -429,10 +429,10 @@
             }
             //#endregion
 
-        //#endregion
+            //#endregion
 
 
-        //浠ヤ笂鏄痩ayui妯″潡
+            //浠ヤ笂鏄痩ayui妯″潡
         });
     </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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
index e5d6510..285f770 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/Xt_ORGANIZATIONSList.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/Xt_ORGANIZATIONSList.html"
@@ -237,7 +237,7 @@
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
                 if (checkStatus.data.length === 1) {
-                    var linterid = data[0].HItemID.toString();
+                    var linterid = data[0].HItemID;
                     //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
                     layer.open({
                         type: 2
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index ac9a084..4e624e8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -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,21 +9,19 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
+
                     <form class="layui-form" action="" lay-filter="component-form-group">
+
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
+
                                 <div class="layui-inline">
                                     <label class="layui-form-label">渚涘簲鍟嗕唬鐮�</label>
                                     <div class="layui-input-block">
@@ -43,17 +41,20 @@
 
                             </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" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-form"></i>鏂板</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>淇敼</button>
                                 <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
-
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
                             </div>
                         </script>
                     </form>
@@ -70,66 +71,106 @@
             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
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
+            //鏌ヨ鏉′欢
             var sWhere = "";
+            var option = [];
+            //#endregion
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
-                    , { field: 'HItemID', title: 'HItemID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                ]]
-            };
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
+            //#endregion
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Supplier/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
-
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btnAdd': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btndelete': set_DeleteBill();
+                        break;
+                };
+            });
             //閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
-
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栭〉闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'radio', fixed: 'left' }
+                        , { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
+                        , { field: 'HItemID', title: 'HItemID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
+                        , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                    ]]
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                $.ajax({
+                    url: GetWEBURL() + '/Gy_Supplier/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            //蹇�熺瓫閫�
+            function get_FastQuery() {
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -138,42 +179,90 @@
                 if (HName) {
                     sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + HName + "%'";
                 }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL() + '/Gy_Supplier/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            // 閲嶇疆鎸夐挳
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            // 鍒犻櫎鎸夐挳
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ModRightNameDelete = "Gy_Supplier_Delete";
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Supplier/Delete_Json',
+                            type: "GET",
+                            //async: true,
+                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
+                                    });
+                                } else {
+                                    layer.alert(result.code + result.Message, { icon: 5 });
+                                }
+                            }, error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        })
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            // 淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀹㈡埛鍩虹璧勬枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=3&linterid=' + checkStatus.data[0].HItemID + '&HSouceBillType=']
+                    , resize: false
+                })
+            }
+            //鏂板鎸夐挳
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板涓嶈壇鍘熷洜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../閲囪喘鍩虹璧勬枡/Gy_Supplier_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
+
                     }
                 });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-
-
-            //laydate.render({
-            //    elem: '#HDate'
-            //    , type: 'datetime'
-            //    , trigger: 'click'
-            //    , format:'yyyy-MM-dd HH:mm'
-            //});
-
-
+            }
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
-
-        
-
 
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
index 7986500..f438e97 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier_Edit.html"
@@ -8,11 +8,7 @@
     <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/layui/lay/modules/util.js"></script>
+
 
 </head>
 <body>
@@ -20,189 +16,191 @@
         <div class="layui-card" style="padding: 15px;background-color: #efefef;">
             <div class="layui-card-body" style="padding: 1px;">
                 <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
-                    <!--<div class="maintitle">閮ㄩ棬</div>-->
-                    <div style="padding: 10px;">
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Add">鏂板</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Check">瀹℃牳</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="FCheck">鍙嶅鏍�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Cancel">閫�鍑�</button>
-                         <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="print">鎵撳嵃</button>
+                    <div class="layui-card-header">
+                        <div class="layui-btn-group">
+
+                            <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                        </div>
+
                     </div>
+                    <h1 style="text-align:center;height:50px;line-height:50px"><b>渚涘簲鍟嗚缃�</b></h1>
                     <div class="layui-form-item" style="padding-top: 10px;">
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+                                <div class="layui-input-inline" style="margin-right:0px">
+                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                     <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
                                 </div>
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                <div class="layui-input-inline">
-                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+                                <div class="layui-input-inline" style="margin-right:0px">
+                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                 </div>
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">缂栫爜</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HNumber" id="HNumber" lay-verify="HNumber" autocomplete="off" placeholder="" class="layui-input">
+                                    <input type="hidden" name="HInterID" id="HInterID">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鍚嶇О</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HName" id="HName" lay-verify="HName" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鍔╄鐮�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="HHelpCode" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">绠�绉�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HShortName" id="HShortName" lay-verify="HShortName" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鍦板潃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HAddress" id="HAddress" lay-verify="HAddress" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鑱旂郴浜�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HLinkMan" id="HLinkMan" lay-verify="HLinkMan" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="HLinkPhone" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鎵嬫満</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="HMobilePhone" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">浼犵湡</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HFax" id="HFax" lay-verify="HFax" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">閭紪</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="HPostalCode" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鐢靛瓙閭</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEmail" id="HEmail" lay-verify="HEmail" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">娉曚汉浠h〃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HCorMan" id="HCorMan" lay-verify="HCorMan" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">寮�鎴烽摱琛�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBank" id="HBank" lay-verify="HBank" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">绋庡姟鐧昏鍙�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HTaxNum" id="HTaxNum" lay-verify="HTaxNum" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鑻辨枃鍚嶇О</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEnglishName" id="HEnglishName" lay-verify="HEnglishName" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鑻辨枃鍦板潃</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HEnglishAddress" id="HEnglishAddress" lay-verify="HEnglishAddress" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">鍥藉</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HCountry" id="HCountry" lay-verify="HCountry" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍦板尯</label>
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">鍦板尯</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
                                     <input type="hidden" name="HAreaID" id="HAreaID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                     </button>
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
-                            <div class="layui-inline">
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">澧炲�肩◣鐜�</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HTaxRate" id="HTaxRate" lay-verify="HTaxRate" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿璐у竵</label>
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">榛樿璐у竵</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
                                     <input type="hidden" name="HCurID" id="HCurID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                     </button>
                                 </div>
                             </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂瑰紡</label>
+                            <div class="layui-col-xs3">
+                                <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">缁撶畻鏂瑰紡</label>
                                 <div class="layui-input-block" style="margin-left: 77px;">
-                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 38%;display: inline-block;" readonly>
                                     <input type="hidden" name="HSSID" id="HSSID" value="0">
-                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                     </button>
                                 </div>
                             </div>
-                            <div class="layui-inline">
+                            <div class="layui-col-xs3">
                                 <label class="layui-form-label">閾惰璐﹀彿</label>
                                 <div class="layui-input-inline">
                                     <input type="text" name="HBankAccount" id="HBankAccount" lay-verify="HBankAccount" autocomplete="off" placeholder="" class="layui-input">
                                 </div>
                             </div>
                         </div>
-                        <div class="layui-row">
+                        <div class="layui-row" style="margin-bottom:5px">
                             <div class="layui-inline" style="width: 56%;">
                                 <label class="layui-form-label">澶囨敞</label>
                                 <div class="layui-input-inline" style="width: 56%;">
@@ -210,93 +208,113 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="layui-row" style="margin-bottom:5px">
+                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                            <div class="layui-input-block">
+                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
+                            </div>
+                        </div>
                     </div>
-                        <!--<div class="title">鍩烘湰淇℃伅</div>-->
-                        <div class="layui-tab" lay-filter="tab-POStockInBill">
-                            <ul class="layui-tab-title" lay-filter="tab-all">
-                                <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
-                                <li lay-id="2" style="padding:1px;">鍏朵粬</li>
-                            </ul>
-                            <div class="layui-tab-content">
-                                <!--鍩烘湰淇℃伅-->
-                                <!--鍏朵粬淇℃伅-->
-                                <div class="layui-tab-item ">
-                                    <div class="layui-form-item" style="padding-top: 10px;">
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">淇敼鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                    <!--<div class="title">鍩烘湰淇℃伅</div>-->
+                    <div class="layui-tab" lay-filter="tab-POStockInBill" style="display:none">
+                        <ul class="layui-tab-title" lay-filter="tab-all">
+                            <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+                            <li lay-id="2" style="padding:1px;">鍏朵粬</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <!--鍩烘湰淇℃伅-->
+                            <!--鍏朵粬淇℃伅-->
+                            <div class="layui-tab-item ">
+                                <div class="layui-form-item" style="padding-top: 10px;">
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreator" id="HCreator" lay-verify="HCreator" autocomplete="off" placeholder="" class="layui-input">
+
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">鍒涘缓鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDater" id="HUpDater" lay-verify="HUpDater" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾浜�</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">淇敼鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HUpDateDate" id="HUpDateDate" lay-verify="HUpDateDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
-                                            <div class="layui-col-xs3">
-                                                <label class="layui-form-label">浣滃簾鏃ユ湡</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
-                                                </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-row">
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HChecker" id="HChecker" lay-verify="HChecker" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">瀹℃牳鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HCheckDate" id="HCheckDate" lay-verify="HCheckDate" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾浜�</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteMan" id="HDeleteMan" lay-verify="HDeleteMan" autocomplete="off" placeholder="" class="layui-input">
+                                            </div>
+                                        </div>
+                                        <div class="layui-col-xs3">
+                                            <label class="layui-form-label">浣滃簾鏃ユ湡</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" name="HDeleteDate" id="HDeleteDate" lay-verify="HDeleteDate" autocomplete="off" placeholder="" class="layui-input">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                            <!--<di-->
-                            <!--v class="layer-footer" style="text-align: center;">
-
-
-        </div>-->
-                            <!--闅愯棌瀛楁-->
-                            <input type="hidden" name="lngBillKey" id="lngBillKey">
-                            <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
-                            <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
-</form>
+                    </div>
+                    <!--闅愯棌瀛楁-->
+                    <input type="hidden" name="lngBillKey" id="lngBillKey">
+                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
+                    <input type="hidden" name="HMaker" id="HMaker"><!--鍒跺崟浜�-->
+                </form>
             </div>
         </div>
     </div>
+
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
                 , layer = layui.layer
@@ -307,38 +325,241 @@
                 , laydate = layui.laydate
                 , util = layui.util
             var sWhere = "";
+            //#endregion
 
 
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
             $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
-
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
             }
-
-            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var HType = params[params[1]];    //鍗曟嵁鐘舵��
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
+            else if (OperationType == 3) {//缂栬緫
+                $("#HInterID").val(linterid);
+                set_EditFromGrid();
+            }
+            else {
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+            }
+            //#endregion
 
 
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //缁撶畻鏂瑰紡寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SettleStyleInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            if (HType == "Modify") {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSSName").val(checkStatus.data[0].HName);
+                        $("#HSSID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //榛樿璐у竵寮圭獥
+            form.on('submit(btnCurrency)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/CurrencyInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].HName);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //鍦板尯寮圭獥
+            form.on('submit(btnArea)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/AreaInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HAreaName").val(checkStatus.data[0].HName);
+                        $("#HAreaID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//鎻愪氦
+                var ModRightNameAdd = 'Gy_Supplier_Edit';
+                var user = sessionStorage["HUserName"];
+
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
+
+
+                var oMain = JSON.stringify(data.field)
+                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+                if (AllowLoadData()) {
+                    if (OperationType == "3") {
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Supplier/AddBill1",
+                            async: true,
+                            data: { "oMain": sBillModeify },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    });
+                                }
+                                else {
+                                    layer.alert(data.Message);
+                                    console.log("Reason" + sBillModeify + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.alert("閿欒:" + err.Message);
+                                console.log("Reason" + sBillModeify);
+                            }
+                        });
+                    }
+                    else {
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Supplier/AddBill",
+                            async: true,
+                            data: { "oMain": oMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    });
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                                layer.closeAll("loading");
+                            },
+                            error: function (err) {
+                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    }
+                }
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function () {
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
+            //瀹℃牳
+            form.on('submit(Check)', function () {
+
+            });
+            //鎵撳嵃Printing
+            form.on("submit(print)", function (data) {
+                layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
+                //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
+
+            });
+            //鏂板
+            form.on('submit(Add)', function () {
+                window.location.reload();
+                $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
+            });
+            //#endregion
+
+
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            //鍒濆鍖栭〉闈�
+            function set_AddFNew() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
+                    type: "GET",
+                    data: {},
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].hitemid);
+                    }
+                });
+            }
+            //缂栬緫椤甸潰鍔犺浇
+            function set_EditFromGrid() {
                 $.ajax({
                     url: GetWEBURL() + "/Gy_Supplier/xg",
                     //url: "http://localhost:12761/Gy_Supplier/xg",
@@ -348,10 +569,35 @@
                     },
                     success: function (d) {
                         ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HRemark").val(d.data[0].HRemark);
+                        $("#HNumber").val(d.data[0].缂栫爜);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HShortName").val(d.data[0].绠�绉�);
+                        $("#HAddress").val(d.data[0].鍦板潃);
+                        $("#HLinkMan").val(d.data[0].鑱旂郴浜�);
+                        $("#HLinkPhone").val(d.data[0].鑱旂郴鐢佃瘽);
+                        $("#HMobilePhone").val(d.data[0].鎵嬫満);
+                        $("#HFax").val(d.data[0].浼犵湡);
+                        $("#HPostalCode").val(d.data[0].閭紪);
+                        $("#HEmail").val(d.data[0].鐢靛瓙閭欢);
+                        $("#HCorMan").val(d.data[0].娉曚汉浠h〃);
+                        $("#HBank").val(d.data[0].寮�鎴烽摱琛�);
+                        $("#HTaxNum").val(d.data[0].绋庡姟鐧昏鍙�);
+                        $("#HEnglishName").val(d.data[0].鑻辨枃鍚嶇О);
+                        $("#HEnglishAddress").val(d.data[0].鑻辨枃鍦板潃);
+                        $("#HCountry").val(d.data[0].鍥藉);
+                        $("#HAreaID").val(d.data[0].鍦板尯ID);
+                        $("#HAreaName").val(d.data[0].鍦板尯鍚嶇О);
+                        $("#HTaxRate").val(d.data[0].澧炲�肩◣鐜�);
+                        $("#HCurID").val(d.data[0].榛樿璐у竵ID);
+                        $("#HCurName").val(d.data[0].榛樿璐у竵);
+                        $("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
+                        $("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
+                        $("#HBankAccount").val(d.data[0].閾惰璐﹀彿);
+                        $("#HName").val(d.data[0].鍚嶇О);
+                        $("#HRemark").val(d.data[0].澶囨敞);
                         $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
                         //table.reload(layTableId, {
                         //    data: ajaxReturnData
                         //});
@@ -359,230 +605,69 @@
 
                 });
             }
-            else {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
-                    type: "GET",
-                    data: { },
-                    success: function (d) {
-                        $("#HInterID").val(d.data[0].hitemid);
-                    }
-                });
-                //Initialization();
+            //杩斿洖楠屾敹
+            function GetHSecManagerValue(obj) {
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
             }
-
-
-            //閫夋嫨楠屾敹
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
-                var sMainStr = JSON.stringify(data.field);
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '楠屾敹鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
-                    }
-                })
-            });
-
-            ////閫夋嫨鍒涘缓缁勭粐
-            //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-            //    var sMainStr = JSON.stringify(data.field);
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '缁勭粐'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
-
-
-            //鑾峰彇鏈�澶у熀纭�璧勬枡ID
-            $.ajax({
-                url: GetWEBURL() + "/Gy_Supplier/GetMAXBillID",
-                type: "GET",
-                data: { },
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].hitemid);
-                }
-            });
-
-            //鎵撳嵃Printing
-            form.on("submit(print)", function (data) {
-                layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
-                //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-
-            });
-
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-                $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-            });
-
-            //瀹℃牳
-            form.on('submit(Check)', function () {
-                
-            });
-
-
-            //閫�鍑�
-            form.on('submit(Cancel)', function () {
-                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
-                });
-            });
-
-
-
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
-
-                var HCreateOrg = $("#HCreateOrg").val();
-                if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
-
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HCreateOrgID = $("#HCreateOrgID").val();
-                if (HCreateOrgID == null || HCreateOrgID == undefined || HCreateOrgID == "") {
-
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HUseOrg = $("#HUseOrg").val();
-                if (HUseOrg == null || HUseOrg == undefined || HUseOrg == "") {
-
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
-                var HUseOrgID = $("#HUseOrgID").val();
-                if (HUseOrgID == null || HUseOrgID == undefined || HUseOrgID == "") {
-
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
-
-                }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
                 var HNumber = $("#HNumber").val();
                 if (HNumber == null || HNumber == undefined || HNumber == "") {
-
-                    layer.msg("璇疯緭鍏ヤ緵搴斿晢缂栫爜锛�", { icon: 5 });
-                    return;
-
+                    layer.msg("璇疯緭鍏ヤ緵搴斿晢缂栫爜", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
                 }
                 var HName = $("#HName").val();
                 if (HName == null || HName == undefined || HName == "") {
-
-                    layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О锛�", { icon: 5 });
+                    layer.msg("璇疯緭鍏ヤ緵搴斿晢鍚嶇О", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var HAddress = $("#HAddress").val();
+                if (HAddress == null || HAddress == undefined || HAddress == "") {
+                    layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
                     return;
 
                 }
-                var ModRightNameAdd = 'Gy_Supplier_Edit';
-                var user = sessionStorage["HUserName"];
 
-
-                var oMain = JSON.stringify(data.field)
-                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Supplier/AddBill1",
-                        //url: "http://localhost:12761/Gy_Supplier/AddBill1",
-                        async: true,
-                        data: { "oMain": sBillModeify},
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("淇濆瓨鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                if ($("#HAreaName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
                 }
-                else
-                {
-                    $.ajax({
-                        type: "POST",
-                        url: GetWEBURL() + "/Gy_Supplier/AddBill",
-                        //url: "http://localhost:12761/Gy_Supplier/AddBill",
-                        async: true,
-                        data: { "oMain": oMain },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("鎻愪氦鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                if ($("#HCurName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
                 }
-            });
+                if ($("#HSSName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨缁撶畻鏂瑰紡", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
 
-
+                var reg = /^0\d{2,3}-?\d{7,8}$/;
+                if (reg.test($("#HLinkPhone").val()) == false || $("#HLinkPhone").val() == '') {
+                    layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
+                if (reg1.test($("#HEmail").val()) == false || $("#HEmail").val() == '') {
+                    layer.msg("璇峰~鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
+                if (reg2.test($("#HMobilePhone").val()) == false || $("#HMobilePhone").val() == '') {
+                    layer.msg("璇峰~鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                else {
+                    return true;
+                }
+            }
+            //#endregion
 
         });
-        //浠ヤ笂涓簂ayui妯″潡
-
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-
-
-
-
+            //浠ヤ笂涓簂ayui妯″潡
 
     </script>
 
+
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
index f7418ea..8d38328 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer.html"
@@ -1,7 +1,7 @@
 锘�<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>瀹㈡埛璁剧疆</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -9,95 +9,53 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
         <div class="layui-col-md12">
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
+
                     <form class="layui-form" action="" lay-filter="component-form-group">
+
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <!--<button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnAdd" style="padding:0 5px">鏂板</button>-->
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
-                                </div>
 
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;">
-                                            <!--<div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="height: 520px; overflow: scroll;"></div>-->
-                                        </div>
-                                        <div class="layui-col-xs12 layui-inline">
-                                            <div class="layui-row">
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">瀹㈡埛浠g爜</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                                    </div>
-                                                </div>
-                                                <div class="layui-inline">
-                                                    <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
-                                                    <div class="layui-input-block">
-                                                        <input type="text" class="layui-input" name="HName" id="HName">
-                                                    </div>
-                                                </div>
-                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                                </button>
-                                            </div>
-                                            <div>
-                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
-                                            </div>
-                                        </div>
+                                <div class="layui-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-row layui-form-item">
-                                    <!--<div class="layui-inline">
-                                    <div id="treeDepartment" lay-filter="treeDepartment" class="demo-tree demo-tree-box" style="width: 200px; height: 500px; overflow: scroll;"></div>
-                                </div>-->
-                                    <!--<div class="" style="padding-top: 10px;">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">閮ㄩ棬浠g爜</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
-                                            </div>
-                                        </div>
-                                        <div class="layui-inline">
-                                            <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
-                                            <div class="layui-input-block">
-                                                <input type="text" class="layui-input" name="HName" id="HName">
-                                            </div>
-                                        </div>
-                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
-                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
-                                        </button>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label" style="width: 85px;">瀹㈡埛鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
                                     </div>
-                                </div>-->
                                 </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+
                             </div>
                         </div>
-                        <!--<table class="" id="mainTable" lay-filter="mainTable"></table>-->
+
+
+                        <table class="" id="mainTable" lay-filter="mainTable"> </table>
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
-                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
-                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
-
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnModify"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnJY"><i class="layui-icon layui-icon-form"></i>绂佺敤</button>-->
+                                <!--<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnFJY"><i class="layui-icon layui-icon-form"></i>鍙嶇鐢�</button>-->
                             </div>
                         </script>
+
                     </form>
+
                 </div>
             </div>
         </div>
@@ -108,126 +66,120 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script>
         layui.config({
+
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
         }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
             //#region 鍏敤鍙橀噺
             var $ = layui.$
-            , admin = layui.admin
-            , layer = layui.layer
-            , table = layui.table
-            , form = layui.form
-            , element = layui.element
-            , laypage = layui.laypage
-            , laydate = layui.laydate
+                , admin = layui.admin
+                , layer = layui.layer
+                , table = layui.table
+                , form = layui.form
+                , element = layui.element
+                , laypage = layui.laypage
+                , laydate = layui.laydate
             var sWhere = "";
-            //#endregion 
-
-            //#region 鍒濆鍖栬〃鏍兼柟娉�
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { type: 'radio', fixed: 'left' }
-                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
-                    , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜' }
-                    , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
-                    , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
-                    , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
-                ]]
-            };
-
-            var index = layer.load(0, { shade: false });
+            var option = [];
             //#endregion
 
-            //#region 杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Customer/list',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
+            //#region 杩涘叆椤甸潰鏃㈠姞杞�
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
             //#endregion
 
-            //#region 閲嶇疆鎸夐挳
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                var checkStatus = table.checkStatus(obj.config.id);
+                switch (obj.event) {
+                    //鏂板
+                    case 'btnAdd': set_AddNew();
+                        break;
+                    //缂栬緫
+                    case 'btnModify': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'btndelete': set_DeleteBill();
+                        break;
+                    //绂佺敤
+                    case 'btnJY': set_AuditBill();
+                        break;
+                    //鍙嶇鐢�
+                    case 'btnFJY': set_DeAuditBill();
+                        break;
+                };
+            });
+            //鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            // 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
-                $("#HNumber").val("");
-                $("#HName").val("");
-                $("#btnSearch").click();
+                set_ClearQuery();
             });
             //#endregion
 
-            //#region 鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
-                var ModRightNameDelete = 'Gy_Department_Delete'
-
-                var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
-                    , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
-                layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
-                    btn: ['Yes', 'No'] //鎸夐挳
-                    , yes: function (index, layero) {
-                        var checkStatus = table.checkStatus('mainTable');
-                        var layEvent = checkStatus.event;
-                        $.ajax({
-                            url: GetWEBURL() + '/Gy_Customer/Delete_Json',
-                            type: "GET",
-                            //async: true,
-                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
-                            success: function (result) {
-                                if (result.count == 1) {
-                                    $("#btnSearch").click();
-                                    layer.msg(result.Message, { icon: 1 });
-
-                                }
-                                else {
-                                    layer.msg(result.Message, { icon: 5 });
-                                }
-                            }
-                        })
-                        layer.close(index); //鍏抽棴寮瑰眰
+            //#region 姝ら〉闈㈡墍鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'radio', fixed: 'left' }
+                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+                        , { field: '瀹㈡埛浠g爜', title: '瀹㈡埛浠g爜' }
+                        , { field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О' }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
+                        , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
+                        , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
+                        , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
+                    ]],
+                    done: function (res, curr, count) {
+                        $("#mainTable").css("width", "100%");
+                    },
+                };
+            }
+            //鏌ヨ
+            function get_Display(sWhere) {
+                var index = layer.load(0, { shade: false });
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_Customer/list',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
-            });
-            //#endregion
-
-            //#region 淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
-                var checkStatus = table.checkStatus('mainTable')
-                    , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '瀹㈡埛鍩虹璧勬枡'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_Customer_Edit.html?HInterID=' + data[0].HItemID + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-            //#endregion
-
-            //#region 鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
+            }
+            //蹇�熸煡璇㈡寜閽�
+            function get_FastQuery() {
+                var ajaxLoad = layer.load();
                 var HNumber = $("#HNumber").val();
                 var HName = $("#HName").val();
                 if (HNumber) {
@@ -245,24 +197,109 @@
                         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 });
                     }
                 });
                 sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            // 閲嶇疆鎸夐挳
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                $("#btnSearch").click();
+            }
+            // 鍒犻櫎鎸夐挳
+            function set_DeleteBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (checkStatus.data.length === 1) {
+                    var ModRightNameDelete = 'Gy_Department_Delete'
+                    layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+                        $.ajax({
+                            url: GetWEBURL() + '/Gy_Customer/Delete_Json',
+                            type: "GET",
+                            //async: true,
+                            data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+                            success: function (result) {
+                                if (result.count == 1) {
+                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        // 寰楀埌frame绱㈠紩
+                                        var index = layer.getFrameIndex(window.name);
+                                        //鍏抽棴褰撳墠frame
+                                        layer.close(index);
+                                        //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+                                        window.location.reload();
 
+                                    });
+                                }
+                                else {
+                                    layer.msg(result.code + result.Message, { icon: 5 });
+                                }
+                            },
+                            error: function () {
+                                layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                            }
+                        })
+                    })
+                }
+                else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+                }
+            }
+            // 淇敼鎸夐挳
+            function set_ShowBill() {
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '瀹㈡埛鍩虹璧勬枡'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['Gy_Customer_Edit.html?OperationType=3&linterid=' + data[0].HItemID + '&HSouceBillType=']
+                    , resize: false
+                })
+            }
+            //鏂板鎸夐挳
+            function set_AddNew() {
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '鏂板涓嶈壇鍘熷洜',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['100%', '100%'],
+                    maxmin: true,
+                    content: '../閿�鍞熀纭�璧勬枡/Gy_Customer_Edit.html?OperationType=1&linterid=&HSouceBillType=',
+                    end: function () {
+                        //鍒锋柊椤甸潰,
+                        location.reload();
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            }
+            // 绂佺敤鎸夐挳
+            function set_AuditBill() {
+
+            }
+            // 鍙嶇鐢ㄦ寜閽�
+            function set_DeAuditBill() {
+
+            }
+            //#endregion
         });
-        //#endregion 
-        
-
-
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
index 816306d..ad7a9c8 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\224\200\345\224\256\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Customer_Edit.html"
@@ -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,7 @@
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -17,226 +17,229 @@
             <div class="layui-card" style="padding: 1px">
                 <div class="layui-card-body" style="padding: 1px;">
                     <form class="layui-form" action="" lay-filter="component-form-group">
-                        <div class="layui-collapse">
-                            <div class="layui-colla-item">
-                                <div class="layui-colla-title layui-inline">
-                                    <div class="layui-inline">
-                                        <span></span>
-                                    </div>
-                                </div>
-                                <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="Saver">淇濆瓨</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnReSearch" style="padding:0 5px">閲嶇疆</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btndelete" style="padding:0 5px">鍒犻櫎</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnModify" style="padding:0 5px">淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnJY" style="padding:0 5px">绂佺敤</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-radius" lay-filter="btnFJY" style="padding:0 5px">鍙嶇鐢�</button>
-                                </div>
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                        <div class="layui-card-header">
+                            <div class="layui-btn-group">
+
+                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+
+                            </div>
+
+                        </div>
+                        <div class="layui-card-body">
+                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                                <h1 style="text-align:center;"><b>瀹㈡埛璧勬枡</b></h1>
+                                <div class="layui-tab-content">
+                                    <div class="layui-tab-item layui-show">
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鍒涘缓缁勭粐</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+                                                <div class="layui-input-inline" style="margin-right:0px;">
+                                                    <input type="text" name="HCreateOrg" id="HCreateOrg" lay-verify="HCreateOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                                     <input type="hidden" name="HCreateOrgID" id="HCreateOrgID" lay-verify="HCreateOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HCreateOrgID-BT" id="HCreateOrgID-BT">...</button>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">浣跨敤缁勭粐</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�">
+                                                <div class="layui-input-inline" style="margin-right:0px">
+                                                    <input type="text" name="HUseOrg" id="HUseOrg" lay-verify="HUseOrg" autocomplete="off" placeholder="" class="layui-input" value="瀹佹尝鍥涚淮灏�" readonly="readonly">
                                                     <input type="hidden" name="HUseOrgID" id="HUseOrgID" lay-verify="HUseOrgID" value="1" autocomplete="off" class="layui-input">
                                                 </div>
-                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT">...</button>
+                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HUseOrgID-BT" id="HUseOrgID-BT">...</button>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">澶囨敞</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HRemark" id="HRemark" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">瀹㈡埛浠g爜</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HNumber" id="HNumber" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">瀹㈡埛鍚嶇О</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HName" id="HName" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鍔╄鐮�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HHelpCode" id="HHelpCode" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">绠�绉�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HShortName" id="HShortName" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">鍦板潃</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HAddress" id="HAddress" lay-verify="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
+                                        </div>
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鑱旂郴浜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HLinkMan" id="HLinkMan" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鑱旂郴鐢佃瘽</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HLinkPhone" id="HLinkPhone" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鎵嬫満</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HMobilePhone" id="HMobilePhone" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">浼犵湡</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HFax" id="HFax" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label">鍦板潃</label>
+                                                <div class="layui-input-inline">
+                                                    <input type="text" name="HAddress" id="HAddress" lay-verify="" autocomplete="off" class="layui-input">
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">閭紪</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HPostalCode" id="HPostalCode" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鐢靛瓙閭</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEmail" id="HEmail" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">娉曚汉浠h〃</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HCorMan" id="HCorMan" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">寮�鎴烽摱琛�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HBank" id="HBank" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">閾惰璐﹀彿</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HBankAccount" id="HBankAccount" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">绋庡姟鐧昏鍙�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HTaxNum" id="HTaxNum" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">澧炲�肩◣鐜�</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HTaxRate" id="HTaxRate" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+
+                                        </div>
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鑻辨枃鍚嶇О</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEnglishName" id="HEnglishName" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鑻辨枃鍦板潃</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HEnglishAddress" id="HEnglishAddress" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div class="layui-row">
-                                            <div class="layui-inline">
+                                            <div class="layui-col-xs3">
                                                 <label class="layui-form-label">鍥藉</label>
                                                 <div class="layui-input-inline">
                                                     <input type="text" name="HCountry" id="HCountry" lay-verify="" autocomplete="off" class="layui-input">
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鍦板尯</label>
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width: 85px;">鍦板尯</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HAreaName" id="HAreaName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HAreaID" id="HAreaID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnArea" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                     </button>
                                                 </div>
                                             </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">榛樿璐у竵</label>
+
+                                        </div>
+                                        <div class="layui-form-item" style="margin-bottom:5px">
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width: 85px;">榛樿璐у竵</label>
                                                 <div class="layui-input-block" style="margin-left: 77px;">
                                                     <input type="text" class="layui-input" name="HCurName" id="HCurName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                     <input type="hidden" name="HCurID" id="HCurID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCurrency" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width: 85px;">缁撶畻鏂瑰紡</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                    <input type="hidden" name="HSSID" id="HSSID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
+                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
+                                                    </button>
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label">瀹㈡埛鐘舵��</label>
+                                                <div class="layui-inline" style="width: 190px;">
+                                                    <input name="HCusStatus" placeholder="鈥旇閫夋嫨鈥�" class="layui-input" id="HCusStatus">
+                                                </div>
+                                            </div>
+                                            <div class="layui-col-xs3">
+                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛鍒嗙被</label>
+                                                <div class="layui-input-block" style="margin-left: 77px;">
+                                                    <input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+                                                    <input type="hidden" name="HCusTypeID" id="HCusTypeID" value="0">
+                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnCustomerType" id="btnSearchProc" style="padding: 0 10px;float: left;background-color:gainsboro;">
                                                         <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
                                                     </button>
                                                 </div>
                                             </div>
                                         </div>
                                         <div class="layui-row">
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">缁撶畻鏂瑰紡</label>
-                                                <div class="layui-input-block" style="margin-left: 77px;">
-                                                    <input type="text" class="layui-input" name="HSSName" id="HSSName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                    <input type="hidden" name="HSSID" id="HSSID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                    </button>
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label">瀹㈡埛鐘舵��</label>
-                                                <div class="layui-input-inline">
-                                                    <input type="text" name="HCusStatus" id="HCusStatus" lay-verify="" autocomplete="off" class="layui-input">
-                                                </div>
-                                            </div>
-                                            <div class="layui-inline">
-                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀹㈡埛鍒嗙被</label>
-                                                <div class="layui-input-block" style="margin-left: 77px;">
-                                                    <input type="text" class="layui-input" name="HCusTypeName" id="HCusTypeName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
-                                                    <input type="hidden" name="HCusTypeID" id="HCusTypeID" value="0">
-                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchProc" id="btnSearchProc" style="padding: 0 10px;float: left;margin-right: 3px;background-color:gainsboro;">
-                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="color:black;"></i>
-                                                    </button>
-                                                </div>
+                                            <label class="layui-form-label">绂佺敤鏍囧織</label>
+                                            <div class="layui-input-block">
+                                                <input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" title="" checked="">
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-tab-item ">
+
+                                <div class="layui-tab-content" style="display:none">
                                     <div class="layui-form-item" style="padding-top: 10px;">
                                         <div class="layui-row">
                                             <div class="layui-col-xs3">
@@ -310,13 +313,26 @@
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
     <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
     <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        if (typeof (params[params[0]]) == "undefined") {
+            var OperationType = 1;//鎿嶄綔绫诲瀷
+        } else {
+            var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+            var linterid = params[params[1]];//婧愬崟id
+            var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+        }
+
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+        }).use(['index', 'dropdown', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+            //#region 鍏叡鍙橀噺
             var $ = layui.$
+                , dropdown = layui.dropdown
                 , admin = layui.admin
                 , layer = layui.layer
                 , table = layui.table
@@ -326,96 +342,31 @@
                 , laydate = layui.laydate
                 , util = layui.util
             var sWhere = "";
+            //#endregion
 
 
+            //#region 杩涘叆椤甸潰鍗冲姞杞�
             $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-
-
-            //鑾峰彇鍙傛暟
-            function getUrlVars() {
-                var vars = [], hash;
-                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
-                for (var i = 0; i < hashes.length; i++) {
-                    hash = hashes[i].split('=');
-                    vars.push(hash[0]);
-                    vars[hash[0]] = hash[1];
-                }
-                return vars;
+            //鍒ゆ柇鎿嶄綔绫诲瀷
+            if (OperationType == 1) {//鏃犳簮鍗�
+                set_AddFNew();
             }
-
-            ////鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
-            //if (sessionStorage.login != "login") {
-            //    layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
-            //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
-            //    }, function () { window.location.href = "../../user/login.html"; });
-            //}
-
-            var params = getUrlVars();
-            var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-            var HType = params[params[1]];    //鍗曟嵁鐘舵��
-            var lSourceBillType = params[params[2]];  //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-
-
-            if (HType == "Modify") {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Customer/xg",
-                    //url: "http://localhost:12761/Gy_Customer/xg",
-                    type: "GET",
-                    data: {
-                        "HInterID": linterid
-                    },
-                    success: function (d) {
-                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
-                        $("#HNumber").val(d.data[0].HNumber);
-                        $("#HName").val(d.data[0].HName);
-                        $("#HHelpCode").val(d.data[0].HHelpCode);
-                        $("#HShortName").val(d.data[0].HShortName);
-                        $("#HAddress").val(d.data[0].HAddress);
-                        $("#HLinkMan").val(d.data[0].HLinkMan);
-                        $("#HLinkPhone").val(d.data[0].HLinkPhone);
-                        $("#HMobilePhone").val(d.data[0].HMobilePhone);
-                        $("#HFax").val(d.data[0].HFax);
-                        $("#HPostalCode").val(d.data[0].HPostalCode);
-                        $("#HEmail").val(d.data[0].HEmail);
-                        $("#HCorMan").val(d.data[0].HCorMan);
-                        $("#HBank").val(d.data[0].HBank);
-                        $("#HBankAccount").val(d.data[0].HBankAccount);
-                        $("#HTaxNum").val(d.data[0].HTaxNum);
-                        $("#HTaxRate").val(d.data[0].HTaxRate);
-                        $("#HEnglishName").val(d.data[0].HEnglishName);
-                        $("#HEngLishAddress").val(d.data[0].HEngLishAddress);
-                        $("#HCountry").val(d.data[0].HCountry);
-                        $("#HCusStatus").val(d.data[0].HCusStatus);
-                        $("#HRemark").val(d.data[0].HRemark);
-                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
-                        //table.reload(layTableId, {
-                        //    data: ajaxReturnData
-                        //});
-                    }
-
-                });
+            else if (OperationType == 3) {//缂栬緫
+                set_EditFromGrid();
             }
             else {
-                $.ajax({
-                    url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
-                    type: "GET",
-                    data: {},
-                    success: function (d) {
-                        $("#HInterID").val(d.data[0].hitemid);
-                    }
-                });
-                //Initialization();
+                layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
             }
+            //#endregion
 
-
-            //閫夋嫨楠屾敹
-            form.on('submit(HSecManagerID-BT)', function (data) {//閫夋嫨楠屾敹
+            //#region 瑙﹀彂浜嬩欢锛�
+            //閫夋嫨鍒涘缓缁勭粐
+            form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
                 var sMainStr = JSON.stringify(data.field);
                 layer.open({
                     type: 2
                     , area: ['100%', '100%']
-                    , title: '楠屾敹鍒楄〃'
+                    , title: '缁勭粐'
                     , shade: 0.6 //閬僵閫忔槑搴�
                     , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
                     , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
@@ -426,199 +377,429 @@
                     }
                 })
             });
+            //缁撶畻鏂瑰紡寮圭獥
+            form.on('submit(btnSearchProc)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/SettleStyleInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-            ////閫夋嫨鍒涘缓缁勭粐
-            //form.on('submit(HCreateOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
-            //    var sMainStr = JSON.stringify(data.field);
-            //    layer.open({
-            //        type: 2
-            //        , area: ['100%', '100%']
-            //        , title: '缁勭粐'
-            //        , shade: 0.6 //閬僵閫忔槑搴�
-            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
-            //        , resize: false
-            //        , cancel: function () {
-            //            //$(".layui-btn").removeClass("layui-btn-disabled");
-            //        }
-            //    })
-            //});
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HSSName").val(checkStatus.data[0].HName);
+                        $("#HSSID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
 
+                    },
+                    success: function (layero, index) {
 
-            //鑾峰彇鏈�澶у熀纭�璧勬枡ID
-            $.ajax({
-                url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
-                type: "GET",
-                data: {},
-                success: function (d) {
-                    //console.log(d.data);
-                    $("#HInterID").val(d.data[0].hitemid);
-                }
-            });
-
-            //鎵撳嵃Printing
-            form.on("submit(print)", function (data) {
-                layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + linterid);
-                //window.open("../鐢熶骇宸ュ簭绠$悊/宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-                window.open("HBarPlanPrint.html?linterid=" + linterid + "&Type=HDepartMent" + "&OpenTmp=b");
-
-            });
-
-            //鏂板
-            form.on('submit(Add)', function () {
-                window.location.reload();
-                $("#HCreator").val(sessionStorage["HUserName"]);//鍒涘缓浜�
-            });
-
-            //瀹℃牳
-            form.on('submit(Check)', function () {
-
-            });
-
-
-            //閫�鍑�
-            form.on('submit(Cancel)', function () {
-                layer.confirm('鎮ㄧ‘瀹氳鍏抽棴鏈〉鍚楋紵', { icon: 3, title: '鎻愮ず' }, function (index) {
-                    parent.location.href = "../../../views/index.html";
+                    }
                 });
             });
+            //榛樿璐у竵寮圭獥
+            form.on('submit(btnCurrency)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/CurrencyInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCurName").val(checkStatus.data[0].HName);
+                        $("#HCurID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
 
+                    },
+                    success: function (layero, index) {
 
-            //鎻愪氦
-            form.on('submit(Saver)', function (data) {//鎻愪氦
+                    }
+                });
+            });
+            //瀹㈡埛鍒嗙被寮圭獥
+            form.on('submit(btnCustomerType)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/CustomerTypeInformation.html', 'yes'],
+                    btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {
 
-                var HCreateOrg = $("#HCreateOrg").val();
-                if (HCreateOrg == null || HCreateOrg == undefined || HCreateOrg == "") {
+                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCusTypeName").val(checkStatus.data[0].HName);
+                        $("#HCusTypeID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
 
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
+                    },
+                    success: function (layero, index) {
 
+                    }
+                });
+            });
+            //鍦板尯寮圭獥
+            form.on('submit(btnArea)', function () {
+                //椤甸潰灞�-鑷畾涔�
+                layer.open({
+                    type: 2,
+                    skin: 'layui-layer-rim', //鍔犱笂杈规
+                    title: '缁撶畻鏂瑰紡鍒楄〃',
+                    closeBtn: 1,
+                    shift: 2,
+                    area: ['80%', '80%'],
+                    maxmin: true,
+                    content: ['../../PublicPage/AreaInformation.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('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HAreaName").val(checkStatus.data[0].HName);
+                        $("#HAreaID").val(checkStatus.data[0].HItemID);
+                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                    }
+                    , btn2: function (index, layero) {
+                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+                    },
+                    end: function () {
+
+                    },
+                    success: function (layero, index) {
+
+                    }
+                });
+            });
+            //閫夋嫨浣跨敤缁勭粐
+            form.on('submit(HUseOrgID-BT)', function (data) {//閫夋嫨鍒涘缓缁勭粐
+                var sMainStr = JSON.stringify(data.field);
+                layer.open({
+                    type: 2
+                    , area: ['100%', '100%']
+                    , title: '缁勭粐'
+                    , shade: 0.6 //閬僵閫忔槑搴�
+                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+                    , resize: false
+                    , cancel: function () {
+                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    }
+                })
+            });
+            //閫夋嫨瀹㈡埛绫诲瀷
+            dropdown.render({
+                elem: '#HCusStatus'
+                , data: [{
+                    title: '娼滃湪'
+                    , id: 101
+                }, {
+                    title: '鍚堟牸'
+                    , id: 102
+                }, {
+                    title: '鏆傛椂'
+                    , id: 103
+                }, {
+                    title: '棰勮'
+                    , id: 104
+                }, {
+                    title: '榛戝悕鍗�'
+                    , id: 105
+                }]
+                , click: function (obj) {
+                    this.elem.val(obj.title);
                 }
-                var HCreateOrgID = $("#HCreateOrgID").val();
-                if (HCreateOrgID == null || HCreateOrgID == undefined || HCreateOrgID == "") {
+                , style: 'width: 190px;'
+            });
+            //淇濆瓨
+            form.on('submit(Saver)', function (data) {//閫夋嫨鍒涘缓缁勭粐
+                var ModRightNameAdd = 'Gy_Customer_Edit';
+                var user = sessionStorage["HUserName"];
 
-                    layer.msg("璇峰厛閫夋嫨鍒涘缓缁勭粐锛�", { icon: 5 });
-                    return;
+                var isEndCheck = document.getElementById("HStopflag").checked;
+                isEndCheck == true ? data.field.HStopflag = 'true' : data.field.HStopflag = 'false';//灏嗘暟缁勫悎骞舵垚瀛楃涓�
 
+                var oMain = JSON.stringify(data.field);
+
+                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
+                if (AllowLoadData()) {
+                    //缂栬緫鈥斺�斾繚瀛�
+                    if (OperationType == "3") {
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Customer/AddBill1",
+                            async: true,
+                            data: { "oMain": sBillModeify },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    });
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    }
+                    //鏂板鈥斺�斾繚瀛�
+                    else {
+                        $.ajax({
+                            type: "POST",
+                            url: GetWEBURL() + "/Gy_Customer/AddBill",
+                            async: true,
+                            data: { "oMain": oMain },
+                            dataType: "json",
+                            success: function (data) {
+                                if (data.count == 1) {
+                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+                                        $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
+                                        var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                                        parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+                                    });
+                                }
+                                else {
+                                    layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                                }
+                            },
+                            error: function (err) {
+                                layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                            }
+                        });
+                    }
                 }
-                var HUseOrg = $("#HUseOrg").val();
-                if (HUseOrg == null || HUseOrg == undefined || HUseOrg == "") {
+            });
+            //閫�鍑�
+            form.on('submit(Exit)', function (data) {//
+                var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+                parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+            });
+            ////閲嶇疆
+            //form.on('submit(btnReSearch)', function (data) {
 
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
+            //});
+            ////鍒犻櫎
+            //form.on('submit(btndelete)', function (data) {
 
-                }
-                var HUseOrgID = $("#HUseOrgID").val();
-                if (HUseOrgID == null || HUseOrgID == undefined || HUseOrgID == "") {
+            //})
+            ////淇敼
+            //form.on('submit(btnModify)', function (data) {
 
-                    layer.msg("璇峰厛閫夋嫨浣跨敤缁勭粐锛�", { icon: 5 });
-                    return;
+            //})
+            ////绂佺敤
+            //form.on('submit(btnJY)', function (data) {
 
-                }
+            //})
+            ////鍙嶇鐢�
+            //form.on('submit(btnFJY)', function (data) {
+
+            //})
+            //#endregion
+
+
+            //#region 姝ら〉闈腑鎵�鏈夌殑鏂规硶
+            //鏃犳簮鍗曟柊澧�
+            function set_AddFNew() {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Customer/GetMAXBillID",
+                    type: "GET",
+                    data: {},
+                    success: function (d) {
+                        $("#HInterID").val(d.data[0].hitemid);
+                        $("input[name='HStopflag']").prop("checked", 'true');//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                    }
+                });
+            }
+            //缂栬緫
+            function set_EditFromGrid() {
+                set_EditForm(linterid);  //缂栬緫鑾峰彇琛ㄥご
+            }
+            //缂栬緫鍔犺浇琛ㄥご
+            function set_EditForm(linterid) {
+                $.ajax({
+                    url: GetWEBURL() + "/Gy_Customer/xg",
+                    //url: "http://localhost:12761/Gy_Customer/xg",
+                    type: "GET",
+                    data: {
+                        "HInterID": linterid
+                    },
+                    success: function (d) {
+                        ajaxReturnData = JSON.parse(JSON.stringify(d)).data;
+                        $("#HNumber").val(d.data[0].瀹㈡埛浠g爜);
+                        $("#HName").val(d.data[0].瀹㈡埛鍚嶇О);
+                        $("#HHelpCode").val(d.data[0].鍔╄鐮�);
+                        $("#HShortName").val(d.data[0].绠�绉�);
+                        $("#HAddress").val(d.data[0].鍦板潃);
+                        $("#HLinkMan").val(d.data[0].鑱旂郴浜�);
+                        $("#HLinkPhone").val(d.data[0].鑱旂郴鐢佃瘽);
+                        $("#HMobilePhone").val(d.data[0].鎵嬫満);
+                        $("#HFax").val(d.data[0].浼犵湡);
+                        $("#HPostalCode").val(d.data[0].閭紪);
+                        $("#HEmail").val(d.data[0].鐢靛瓙閭欢);
+                        $("#HCorMan").val(d.data[0].娉曚汉浠h〃);
+                        $("#HBank").val(d.data[0].寮�鎴烽摱琛�);
+                        $("#HBankAccount").val(d.data[0].閾惰璐﹀彿);
+                        $("#HTaxNum").val(d.data[0].绋庡姟鐧昏鍙�);
+                        $("#HTaxRate").val(d.data[0].澧炲�肩◣鐜�);
+                        $("#HEnglishName").val(d.data[0].鑻辨枃鍚嶇О);
+                        $("#HEnglishAddress").val(d.data[0].鑻辨枃鍦板潃);
+                        $("#HCountry").val(d.data[0].鍥藉);
+                        $("#HCusStatus").val(d.data[0].瀹㈡埛鐘舵��);
+                        $("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
+                        layui.form.render();//瀹炴椂娓叉煋閫変腑鍜屼笉閫変腑鐨勬牱寮�,鏈�濂芥坊鍔犺繖鍙ヨ瘽
+                        $("#HRemark").val(d.data[0].澶囨敞);
+                        $("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
+                        $("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
+                        $("#HSSID").val(d.data[0].缁撶畻鏂瑰紡ID);
+                        $("#HCurName").val(d.data[0].榛樿璐у竵);
+                        $("#HCurID").val(d.data[0].榛樿璐у竵ID);
+                        $("#HAreaName").val(d.data[0].鍦板尯鍚嶇О);
+                        $("#HAreaID").val(d.data[0].鍦板尯ID);
+                        $("#HCusTypeName").val(d.data[0].瀹㈡埛鍒嗙被);
+                        $("#HCusTypeID").val(d.data[0].瀹㈡埛鍒嗙被ID);
+                    }
+
+                });
+            }
+            //鏁版嵁楠岃瘉
+            function AllowLoadData() {
                 var HNumber = $("#HNumber").val();
                 if (HNumber == null || HNumber == undefined || HNumber == "") {
-
-                    layer.msg("璇疯緭鍏ュ鎴风紪鐮侊紒", { icon: 5 });
-                    return;
-
+                    layer.msg("璇疯緭鍏ュ鎴蜂唬鐮侊紒", { icon: 5 });
+                    return false;
                 }
                 var HName = $("#HName").val();
                 if (HName == null || HName == undefined || HName == "") {
 
                     layer.msg("璇疯緭鍏ュ鎴峰悕绉帮紒", { icon: 5 });
+                    return false;
+                }
+                var HTaxRate = $("#HTaxRate").val();
+                if (HTaxRate == null || HTaxRate == undefined || HTaxRate == "") {
+                    layer.msg("澧炲�肩◣鐜囦笉寰椾负绌猴紒", { icon: 5 });
                     return;
 
                 }
-                var ModRightNameAdd = 'Gy_Customer_Edit';
-                var user = sessionStorage["HUserName"];
+                var HAddress = $("#HAddress").val();
+                if (HAddress == null || HAddress == undefined || HAddress == "") {
+                    layer.msg("鍦板潃涓嶅緱涓虹┖锛�", { icon: 5 });
+                    return;
 
+                }
+                if ($("#HAreaName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨鍦板尯", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HCurName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨榛樿璐у竵", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HSSName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨缁撶畻鏂瑰紡", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HCusStatus").val() == '' || $("#HCusStatus").val() == "鈥旇閫夋嫨鈥�") {
+                    layer.msg("娌℃湁閫夋嫨瀹㈡埛鐘舵��", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                if ($("#HCusTypeName").val() == '') {
+                    layer.msg("娌℃湁閫夋嫨瀹㈡埛鍒嗙被", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
 
-                var oMain = JSON.stringify(data.field)
-                var sBillModeify = oMain + ';' + linterid + ';' + user + ';' + ModRightNameAdd;
-                var index = layer.load();
-                if (HType == "Modify") {
-                    $.ajax({
-                        type: "POST",
-                        //url: GetWEBURL() + "/Gy_Customer/AddBill1",
-                        url: "http://localhost:12761/Gy_Customer/AddBill1",
-                        async: true,
-                        data: { "oMain": sBillModeify },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("淇濆瓨鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                var reg = /^0\d{2,3}-?\d{7,8}$/;
+                if (reg.test($("#HLinkPhone").val()) == false || $("#HLinkPhone").val() == '') {
+                    layer.msg("鑱旂郴鐢佃瘽鍙风爜鏈夎锛岃杈撳叆鍖哄彿+鍙风爜鏍煎紡鐨勭數璇濆彿鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var reg1 = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/;
+                if (reg1.test($("#HEmail").val()) == false || $("#HEmail").val() == '') {
+                    layer.msg("璇峰~鍐欐纭牸寮忕殑閭", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
+                }
+                var reg2 = /^[1][3,4,5,7,8][0-9]{9}$/;
+                if (reg2.test($("#HMobilePhone").val()) == false || $("#HMobilePhone").val() == '') {
+                    layer.msg("璇峰~鍐欐纭牸寮忕殑鎵嬫満鍙�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+                    return false;
                 }
                 else {
-                    $.ajax({
-                        type: "POST",
-                        //url: GetWEBURL() + "/Gy_Customer/AddBill",
-                        url: "http://localhost:12761/Gy_Customer/AddBill",
-                        async: true,
-                        data: { "oMain": oMain },
-                        dataType: "json",
-                        success: function (data) {
-                            if (data.count == 1) {
-                                //layer.confirm(data.Message, {
-                                //    icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
-                                //    btn2: function () {
-                                //        //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
-                                //        //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
-                                //        parent.location.href = "../../../views/index.html"
-                                //    }//鍏抽棴
-                                //}, function () { window.location.reload(); });//鏂板
-                                layer.close(index);
-                                layer.msg("鎻愪氦鎴愬姛");
-                            }
-                            else {
-                                layer.close(index);
-                                layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                            }
-                        },
-                        error: function (err) {
-                            layer.close(index);
-                            layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                        }
-                    });
+                    return true;
                 }
-            });
-
-
+            }
+            //杩斿洖楠屾敹
+            function GetHSecManagerValue(obj) {
+                $("#HSecManager").val(obj[0].HName);
+                $("#HSecManagerID").val(obj[0].HItemID);
+            }
+            //#endregion
 
         });
-        //浠ヤ笂涓簂ayui妯″潡
-
-        function GetHSecManagerValue(obj) {  //杩斿洖楠屾敹
-            $("#HSecManager").val(obj[0].HName);
-            $("#HSecManagerID").val(obj[0].HItemID);
-        }
-
-
-
+            //浠ヤ笂涓簂ayui妯″潡
 
 
     </script>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
index fbadbf0..d888320 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainPlanBillEdit.html"
@@ -200,7 +200,7 @@
             var option1 = [];//閰嶄欢
             var sBillType = "3902";
             var TabRow = { "HMaintainItemID": 0, "HMaintainItemNumber": " ", "HMaintainItem": " ", "HMaintainPart": " ", "HClaim": " ", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HRemark": " " };//淇濆吇
-            var TabRow1 = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HQty": "", "HRemark": "" };//閰嶄欢
+            var TabRow1 = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HQty": "", "HRemark": "" };//閰嶄欢
             //#endregion
 
 
@@ -784,7 +784,7 @@
                                     //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
                                     obj.update({
                                         HMaterID: checkStatus.data[0].HItemID,
-                                        HMaterCode: checkStatus.data[0].HNumber,
+                                        HMaterNumber: checkStatus.data[0].HNumber,
                                         HMaterName: checkStatus.data[0].HName
                                     });
                                     layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
@@ -846,11 +846,11 @@
                 if (typeof (sSubStr1) != "undefined" && typeof (sSubStr1) != "") {
                     sSubStr1 = JSON.parse(sSubStr1);
                     for (var i = 0; i < sSubStr1.length; i++) {
-                        if (sSubStr1[i].HMaterCode == "") {
+                        if (sSubStr1[i].HMaterNumber == "") {
                             layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,閰嶄欢浠g爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;
                         }
-                        if (sSubStr1[i].HUnitCode == "") {
+                        if (sSubStr1[i].HUnitNumber == "") {
                             layer.msg("閰嶄欢椤规槑缁嗚褰曠" + (i + 1) + "琛�,鍗曚綅浠g爜淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
                             return false;
                         }
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationQty.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationQty.html"
new file mode 100644
index 0000000..5d19482
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationQty.html"
@@ -0,0 +1,198 @@
+锘�<!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, maximum-scale=1">
+    <link href="../../../layuiadmin/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../../layuiadmin/style/admin.css" rel="stylesheet" />
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <style type="text/css">
+        input.layui-input.layui-unselect {
+            padding-right: 0;
+        }
+    </style>
+</head>
+<body>
+    <div class="layui-fluid">
+        <div class="layui-col-md12">
+            <div class="layui-card" style="padding: 1px">
+                <div class="layui-card-body" style="padding: 1px;">
+                    <form class="layui-form" action="" lay-filter="component-form-group">
+                        <!--<div class="layui-collapse">
+                            <div class="layui-colla-item">
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">娴佹按鍙�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <label class="layui-form-label">鍒跺崟浜�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
+                                    </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 15px">閲嶇疆</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="Exit">閫�鍑�</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>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+    <script>
+        //鑾峰彇鍙傛暟
+        var params = get_UrlVars();
+        var HInterID = params[params[0]];//鑾峰彇浼犲叆鐨凥interID
+
+        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
+                , util = layui.util
+            //鏌ヨ鏉′欢
+            var option = [];
+            //#endregion
+
+            //鍒濆鍖栭〉闈㈠姞杞�
+            set_ClearBill();
+
+
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+            //澶村伐鍏锋爮浜嬩欢
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    //閫�鍑�
+                    case 'Exit': set_Exit();
+                        break;
+                };
+            });
+
+            // 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+
+            // 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 褰撳墠椤甸潰鍔犺浇鎵�鏈夋柟娉�
+            // 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(HInterID);
+            }
+
+            //鍒濆鍖栬〃鏍�
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , limits: [20, 50, 100, 150, 200, 250]
+                    , limit: 20
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'radio', fixed: 'left' }
+                        , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', width: 200 }
+                        , { field: '娴佽浆鍗″彿', title: '娴佽浆鍗″彿', width: 200 }
+                        , { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 200 }
+                        , { field: '浜у搧浠g爜', title: '浜у搧浠g爜', width: 200 }
+                        , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 200 }
+                        , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width: 200 }
+                        , { field: '娴佹按鍙�', title: '娴佹按鍙�', width: 200 }
+                        , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 200 }
+                        , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 200 }
+                        , { field: '鏄惁濮斿', title: '鏄惁濮斿', width: 200 }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 200 }
+                        , { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺', width: 200 }
+                        , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', width: 200 }
+                        , { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺', width: 200 }
+                    ]]
+                };
+            }
+
+            //鏌ヨ
+            function get_Display(HInterID) {
+                var index = layer.load(0);
+                //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Cj_StationInBill/GetStationQtyList',
+                    type: "GET",
+                    data: { "HInterID": HInterID },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(index);
+                        } else {
+                            layer.close(index);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(index);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+            }
+            
+            //閫�鍑�
+            function set_Exit(){
+                Pub_Close(1);
+            }
+            //#endregion
+
+            //鐩戝惉琛屽弻鍑讳簨浠�
+            table.on('rowDouble(mainTable)', function (obj) {
+                layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
+            });
+            //#endregion
+
+            //laydate.render({
+            //    elem: '#HDate'
+            //    , type: 'datetime'
+            //    , trigger: 'click'
+            //    , format:'yyyy-MM-dd HH:mm'
+            //});
+
+
+            //浠ヤ笂鏄痩ayui妯″潡
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file

--
Gitblit v1.9.1