From 7da024cee54bf11b4fa80c611a8f98213b3c127e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 13 九月 2021 17:24:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_MouldType.html |   16 
 WebTM/views/模治具管理/模治具管理/Gy_Mould.html              |  385 +++++++++++-------
 WebTM/layuiadmin/Scripts/webConfig.js              |    4 
 WebTM/views/基础资料/公用基础资料/Gy_MouldType.html          |  311 ++++++++-------
 WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html |  438 ++++++++++++++++-----
 5 files changed, 736 insertions(+), 418 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 71ab924..e6b0b20 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,11 +2,11 @@
 function GetWEBURL() {
     //var WEBURL = "http://192.168.16.80:8011/";          //鍔炲叕瀹ゆ湇鍔″櫒
     //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch鏈湴
-    //var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
+    var WEBURL = "http://localhost:8085/API/";   //zgq鏈湴
     //var WEBURL = "http://localhost:8080/API/";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/lubao";   //棰滄檽鍐涙湰鍦伴厤缃�
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄩ湶鏈湴閰嶇疆
-    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
+    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //绔犵传鏌旀湰鍦伴厤缃�
     //var WEBURL = "http://10.1.4.155/API/";   //姹熶赴瀹㈡埛NEW
     //var WEBURL = "http://47.96.97.237/API/";   //鏅轰簯鏈嶅姟鍣�
     //var WEBURL = "http://183.129.128.86:9090/API/";   //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
index f99e4f5..30e92e1 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_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_MouldType.html"
@@ -8,6 +8,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+    <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 type="text/css">
         .layui-form-label {
             width: 85px;
@@ -79,10 +84,10 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
     <script>
         //鑾峰彇鍙傛暟
         function getUrlVars() {
@@ -127,13 +132,10 @@
             //        icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
             //    }, function () { window.location.href = "../../user/login.html"; });
             //}
-
             //#region 宸ュ叿鎸夐挳
             //閫�鍑烘寜閽�
-            form.on('submit(Cancel)', function () {
-                //sessionStorage["SourceFlag"] = false;
-                parent.location.href = "../../../views/index.html"
-                //window.close();//鍏抽棴褰撳墠椤�
+            form.on('submit(Exit)', function () {
+                Pub_Close(1);
             })
             //淇濆瓨
             form.on('submit(Saver)', function (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/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 ab3e6df..4d5e78d 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"
@@ -333,10 +333,10 @@
                                         <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;">
+                                                <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">
+                                                <input type="hidden" name="HCTPrjNumber" id="HCTPrjNumber" value="">
+                                                <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>
@@ -481,7 +481,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-row">000000000000000
+                                    <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">
@@ -562,8 +562,10 @@
                                                 <div class="layui-form">
                                                     <div class="layui-form-item">
                                                         <select name="HEmpType" id="HEmpType" lay-verify="HEmpType">
-                                                            <!--<option value="鐢�">鐢�</option>
-                                                             <option value="濂�">濂�</option>-->
+                                                            <option value="鍥哄畾宸ヨ祫">鍥哄畾宸ヨ祫</option>
+                                                            <option value="娴姩宸ヨ祫">娴姩宸ヨ祫</option>
+                                                            <option value="绯绘暟宸ヨ祫">绯绘暟宸ヨ祫</option>
+                                                            <option value="鏈堝害宸ヨ祫">鏈堝害宸ヨ祫</option>
                                                         </select>
                                                     </div>
                                                 </div>
@@ -643,13 +645,13 @@
                                     </div>
                                     <div class="maintitle">鐗规畩璧勬枡</div>
                                     <div class="layui-row">
-                                        <div class="layui-col-xs6 layui-inline">
+                                        <div class="layui-col-xs5 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">鍩烘湰宸ヨ祫</label>
                                             <div class="layui-input-block">
                                                 <input class="layui-input" name="HBasePay" id="HBasePay" autocomplete="off" style=" width: 75%;">
                                             </div>
                                         </div>
-                                        <div class="layui-col-xs6 layui-inline">
+                                        <div class="layui-col-xs7 layui-inline">
                                             <label class="layui-form-label" style="width: 12.5%;">鑱屽姟鑰冩牳宸ヨ祫</label>
                                             <div class="layui-input-block">
                                                 <input class="layui-input" name="HExamLevPostMoney" id="HExamLevPostMoney" autocomplete="off" style=" width: 75%;">
@@ -669,8 +671,8 @@
                                                 <div class="layui-form">
                                                     <div class="layui-form-item">
                                                         <select name="HPayType" id="HPayType" lay-verify="HPayType">
-                                                            <!--<option value="鐢�">鐢�</option>
-                                                             <option value="濂�">濂�</option>-->
+                                                            <option value="鐜伴噾">鐜伴噾</option>
+                                                            <option value="閾惰鍗�">閾惰鍗�</option>
                                                         </select>
                                                     </div>
                                                 </div>
@@ -788,6 +790,34 @@
             });
             //#endregion
 
+            //閫夋嫨鑱屽姟鎸夐挳
+            form.on('submit(HDutyID-BT)', function () {
+                get_checkDuty();
+            });
+            //閫夋嫨瀹胯垗鎸夐挳HWorkTypeID
+            form.on('submit(HDormID-BT)', function () {
+                get_checkDorm();
+            });
+            //閫夋嫨宸ョ鎸夐挳
+            form.on('submit(HWorkTypeID-BT)', function () {
+                get_checkWorkType();
+            });
+            //閫夋嫨鏍哥畻鏂瑰紡鎸夐挳
+            form.on('submit(HCTPrjID-BT)', function () {
+                get_checkCTPrj();
+            }); 
+            //閫夋嫨閮ㄩ棬鎸夐挳
+            form.on('submit(HDeptID-BT)', function () {
+                get_checkDept();
+            });
+            //閫夋嫨宀椾綅鎸夐挳
+            form.on('submit(HPostID-BT)', function () {
+                get_checkPost();
+            });
+            //閫夋嫨鐝粍鎸夐挳
+            form.on('submit(HGroupID-BT)', function () {
+                get_checkGroup();
+            });
             //#region 鏄惁璋冧紤
             form.on('checkbox(checkboxHOverType)', function (data) {
                 $("#HOverType").val(data.elem.checked);
@@ -813,128 +843,279 @@
             });
 
         //#endregion
-            //#region 閫夋嫨鑱屽姟
-            form.on('submit(HDutyID-BT)', function () {//閫夋嫨鑱屽姟
+
+            //#region 閫夋嫨鑱屽姟鏂规硶
+            function get_checkDuty() {
                 layer.open({
-                    type: 2
-                    , area: ['90%', '90%']
-                    , title: '鑱屽姟鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鑱屽姟鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DutyList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDutyName").val(checkStatus.data[0].HName);
+                        $("#HDutyID").val(checkStatus.data[0].HItemID);
+                        $("#HDutyNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
 
-            //#region 閫夋嫨瀹胯垗
-            form.on('submit(HDormID-BT)', function () {//閫夋嫨瀹胯垗
+            ////#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
-                    , area: ['90%', '90%']
-                    , title: '瀹胯垗鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '瀹胯垗鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DormList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDormName").val(checkStatus.data[0].HName);
+                        $("#HDormID").val(checkStatus.data[0].HItemID);
+                        $("#HDormNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
 
-            //#region 閫夋嫨宸ョ
-            form.on('submit(HWorkTypeID-BT)', function () {//閫夋嫨宸ョ
+            ////#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 get_checkWorkType() {
                 layer.open({
-                    type: 2
-                    , area: ['90%', '90%']
-                    , title: '宸ョ鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宸ョ鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HWorkTypeName").val(checkStatus.data[0].HName);
+                        $("#HWorkTypeID").val(checkStatus.data[0].HItemID);
+                        $("#HWorkTypeNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
 
+            ////#region 閫夋嫨宸ョ
+            //form.on('submit(HWorkTypeID-BT)', function () {//閫夋嫨宸ョ
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '宸ョ鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
             //#region 閫夋嫨鏍哥畻鏂瑰紡
-            form.on('submit(HCTPrjID-BT)', function () {//閫夋嫨鏍哥畻鏂瑰紡
+            function get_checkCTPrj() {
                 layer.open({
-                    type: 2
-                    , area: ['90%', '90%']
-                    , title: '鏍哥畻鏂瑰紡鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HCTPrjName").val(checkStatus.data[0].HName);
+                        $("#HCTPrjID").val(checkStatus.data[0].HItemID);
+                        $("#HCTPrjNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
 
-            //#region 閫夋嫨閮ㄩ棬
-            form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+            ////#region 閫夋嫨鏍哥畻鏂瑰紡
+            //form.on('submit(HCTPrjID-BT)', function () {//閫夋嫨鏍哥畻鏂瑰紡
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '鏍哥畻鏂瑰紡鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
+
+            //#region 閫夋嫨閮ㄩ棬鏂规硶
+            function get_checkDept() {
                 layer.open({
-                    type: 2
-                    , area: ['90%', '90%']
-                    , title: '閮ㄩ棬鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '閮ㄩ棬鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
+                    , content: ['../../PublicPage/DeptInformation.html', 'yes']
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HDeptName").val(checkStatus.data[0].HName);
+                        $("#HDeptID").val(checkStatus.data[0].HItemID);
+                        $("#HDeptNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
 
-            //#region 閫夋嫨宀椾綅
-            form.on('submit(HPostID-BT)', function () {//閫夋嫨宀椾綅
+            ////#region 閫夋嫨閮ㄩ棬
+            //form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '閮ㄩ棬鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
+            //#region 閫夋嫨宀椾綅鏂瑰紡
+            function get_checkPost() {
                 layer.open({
-                    type: 2
-                    , area: ['90%', '90%']
-                    , title: '宀椾綅鍒楄〃'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                    type: 2//寮圭獥绫诲瀷
+                    , skin: 'layui-layer-rim' //鍔犱笂杈规
+                    , area: ['90%', '90%']//澶у皬
+                    , title: '宀椾綅鍒楄〃'//鏍囬
+                    , shift: 2//寮瑰嚭鍔ㄧ敾
                     , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_PostList.html', 'yes']
-                    , resize: false
-                    , cancel: function () {
-                        //$(".layui-btn").removeClass("layui-btn-disabled");
+                    , btn: ['纭畾', '鍙栨秷']
+                    , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                        var iframeWindow = window['layui-layer-iframe' + index]  //鑾峰彇寮规椤甸潰
+                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+                        if (checkStatus.data.length === 0) {
+                            return layer.msg('璇烽�夋嫨鏁版嵁');
+                        }
+                        $("#HPostName").val(checkStatus.data[0].HName);
+                        $("#HPostID").val(checkStatus.data[0].HItemID);
+                        $("#HPostNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
+                    , btn2: function (index, layero) { }
                 })
-            });
+            }
             //#endregion
+            ////#region 閫夋嫨宀椾綅
+            //form.on('submit(HPostID-BT)', function () {//閫夋嫨宀椾綅
+            //    layer.open({
+            //        type: 2
+            //        , area: ['90%', '90%']
+            //        , title: '宀椾綅鍒楄〃'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_PostList.html', 'yes']
+            //        , resize: false
+            //        , cancel: function () {
+            //            //$(".layui-btn").removeClass("layui-btn-disabled");
+            //        }
+            //    })
+            //});
+            ////#endregion
 
-            //#region 閫夋嫨鐝粍
-            form.on('submit(HGroupID-BT)', function () {//閫夋嫨鐝粍
+            //#region 閫夋嫨鐝粍鏂规硶
+            function get_checkGroup() {
                 layer.open({
-                    type: 2,
-                    skin: 'layui-layer-rim', //鍔犱笂杈规
-                    title: '鐝粍鍒楄〃',
-                    closeBtn: 1,
-                    shift: 2,
-                    area: ['90%', '90%'],
-                    maxmin: true,
-                    content: ['../../../views/PublicPage/GroupInformation.html', 'yes'],
-                    btn: ['纭畾', '鍙栨秷']
-                    , btn1: function (index, layero) {
-                        //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+                    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) {
@@ -942,18 +1123,47 @@
                         }
                         $("#HGroup").val(checkStatus.data[0].HName);
                         $("#HGroupID").val(checkStatus.data[0].HItemID);
-                        layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+                        $("#HGroupNumber").val(checkStatus.data[0].HNumber);
+                        layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
                     }
-                    , btn2: function (index, layero) {
-                        //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
-                        //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
-                    },
-                    end: function () {
-
-                    }
-                });
-            });
+                    , btn2: function (index, layero) { }
+                })
+            }
             //#endregion
+
+            ////#region 閫夋嫨鐝粍
+            //form.on('submit(HGroupID-BT)', function () {//閫夋嫨鐝粍
+            //    layer.open({
+            //        type: 2,
+            //        skin: 'layui-layer-rim', //鍔犱笂杈规
+            //        title: '鐝粍鍒楄〃',
+            //        closeBtn: 1,
+            //        shift: 2,
+            //        area: ['90%', '90%'],
+            //        maxmin: true,
+            //        content: ['../../../views/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(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨�
+            //        }
+            //        , btn2: function (index, layero) {
+            //            //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+            //            //return false 寮�鍚浠g爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+            //        },
+            //        end: function () {
+
+            //        }
+            //    });
+            //});
+            ////#endregion
 
         //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
 
@@ -1012,8 +1222,9 @@
                                 , "HItemID": data.HItemID
                                 , "HName": data.鑱屽憳鍚嶇О
                                 , "HHelpCode": data.鍔╄浠g爜
-                                , "HGroupID": data.HGroupID
-                                , "HGroup": data.鐝粍鍚嶇О
+                                , "HGroupID": data.鐝粍ID
+                                , "HGroupName": data.鐝粍鍚嶇О
+                                , "HGroupNumber": data.鐝粍浠g爜
                                 , "HEndFlag": data.鏄庣粏鏍囪
                                 , "HNoBrushFlag": data.鏄惁鎵撳崱
                                 , "HOverType": data.鏄惁璋冧紤
@@ -1024,14 +1235,19 @@
                                 , "HDeptName": data.閮ㄩ棬鍚嶇О
                                 , "HDutyID": data.鑱屽姟ID
                                 , "HDutyName": data.鑱屽姟鍚嶇О
+                                , "HDutyNumber": data.鑱屽姟浠g爜
                                 , "HDormID": data.瀹胯垗ID
                                 , "HDormName": data.瀹胯垗鍚嶇О
+                                , "HDormNumber": data.瀹胯垗浠g爜
                                 , "HWorkTypeID": data.宸ョID
                                 , "HWorkTypeName": data.宸ョ鍚嶇О
+                                , "HWorkTypeNumber": data.宸ョ浠g爜
                                 , "HCTPrjID": data.鏍哥畻鏂瑰紡ID
                                 , "HCTPrjName": data.鏍哥畻鏂瑰紡鍚嶇О
+                                , "HCTPrjNumber": data.鏍哥畻鏂瑰紡浠g爜
                                 , "HPostID": data.宀椾綅ID
                                 , "HPostName": data.宀椾綅鍚嶇О
+                                , "HPostNumber": data.宀椾綅浠g爜
                                 , "HSex": data.鎬у埆
                                 , "HBirthDay": data.鍑虹敓骞存湀
                                 , "HAge": data.骞撮緞
@@ -1106,11 +1322,11 @@
                 var sMainStr = JSON.stringify(data.field);
                 $.ajax({
                     type: "POST",
-                    url: GetWEBURL() + "SaveGy_EmployeeList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+                    url: GetWEBURL() + "Gy_Employee/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
                     async: true,
-                    data: { "msg": sMainStr },
+                    data: { "oMain": sMainStr },
                     dataType: "json",
-                    success: function (data) {
+                    success: function (data) { 
                         if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
                             layer.msg(data.Message, { icon: 1 });
                             $('#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_MouldType.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
index c0ffee1..f1044c2 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MouldType.html"
@@ -8,26 +8,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
-    <script src="../../../layuiadmin/layui/zgqlayui.js"></script>
+    <!--<script src="../../../layuiadmin/layui/zgqlayui.js"></script>
     <script src="../../../layuiadmin/treeTable.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
     <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
     <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
-    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
-    <style media="screen">
-        .custom-tree-item-clicked {
-            color: #FC9003
-        }
-        .layui-form-label {
-            width: 40px;
-            padding: 9px 5px;
-        }
+    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>-->
+    <script src="../../../layuiadmin/layui/layui.js"></script>
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
 
-        .layui-input-block {
-            margin-left: 50px;
-        }
-    </style>
 </head>
 <body>
     <div class="layui-fluid">
@@ -37,53 +30,42 @@
                     <form class="layui-form" action="" lay-filter="component-form-group">
                         <div class="layui-collapse">
                             <div class="layui-colla-item">
-                                <div style="padding: 10px;">
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnAdd"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btnModify"><i class="layui-icon layui-icon-edit"></i>淇敼</button>
-                                    <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-filter="btndelete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
-                                </div>
-
-                                <div class="layui-form-item" style="border-top: solid 1px #F6F6F6;">
-                                    <div class="layui-row" style="padding:10px 0">
-                                        <div class="layui-col-xs3 layui-inline" style="width: 23%;display:none;">
-                                            <div id="treeCheckItem" lay-filter="treeCheckItem" 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-inline">
+                                    <label class="layui-form-label" style="width: 85px;">鍚嶇О</label>
+                                    <div class="layui-input-block" style="margin-left: 120px;">
+                                        <input type="text" class="layui-input" name="HName" id="HName">
+                                    </div>
+                                </div>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                                </button>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
 
                             </div>
                         </div>
+                        <table class="" id="mainTable" lay-filter="mainTable"></table>
+                        <script type="text/html" id="toolbarDemo">
+                            <div class="layui-btn-container">
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+                            </div>
+                        </script>
                     </form>
                 </div>
             </div>
         </div>
     </div>
-
-
     <script>
-        var treeCkData = { id: 0 };
+     
         var TagId = "";
         var TagParentId = "";
         var Level = "1";
@@ -107,10 +89,9 @@
             //鏌ヨ鏉′欢
             var sWhere = "";
             var option = [];
-            let that = this;
             //#endregion
 
-           
+
             //#region 杩涘叆椤甸潰鍗冲姞杞�
             //鍒濆鍖栧姞杞芥爲鍨�
             //tree.render({
@@ -163,8 +144,42 @@
             //鍒濆鍖栬〃鏍�
             set_ClearBill();
             //#endregion
+            //#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;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
+            form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
             //鍒濆鍖栬〃鏍�
+
             function set_ClearBill() {
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
@@ -177,12 +192,12 @@
             function set_InitGrid() {
                 option = {
                     elem: '#mainTable'
-                    //, toolbar: '#toolbarDemo'
+                    , toolbar: '#toolbarDemo'
                     , height: '500'
                     , page: true
                     , cellMinWidth: 90
                     , cols: [[
-                        { type: 'radio', fixed: 'left' }
+                        { type: 'checkbox', fixed: 'left' }
                         , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                         , { field: 'HParentID', title: 'HParentID', sort: true, hide: true }
                         , { field: 'HNumber', title: '浠g爜', width: 200 }
@@ -197,7 +212,7 @@
             }
             //鏌ヨ
             function get_Display(sWhere) {
-                var index = layer.load(0, { shade: false });
+                var ajaxLoad = layer.load();
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
                     url: GetWEBURL() + '/Gy_ModelType/list',
@@ -207,23 +222,45 @@
                         if (data1.count == 1) {
                             option.data = data1.data;
                             table.render(option);
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                         } else {
-                            layer.close(index);
+                            layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
                     }, error: function () {
-                        layer.close(index);
+                        layer.close(ajaxLoad);
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
                     }
                 });
             }
-           //#endregion
+            //#endregion
 
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and HNumber like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and HName like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
+                $("#HNumber").val("");
+                $("#HName").val("");
+                sWhere = "";
+            }
+            //#endregion
 
             //#region 宸ュ叿鏍忎簨浠�
             //鏂板
-            form.on('submit(btnAdd)', function (obj) {
+            function set_AddNew() {
                 //椤甸潰灞�-鑷畾涔�
                 layer.open({
                     type: 2,
@@ -233,20 +270,14 @@
                     shift: 2,
                     area: ['80%', '80%'],
                     maxmin: true,
-                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level+''],
-                    end: function () {
-                        //鍒锋柊椤甸潰,
-                        location.reload();
-                    },
-                    success: function (layero, index) {
-
-                    }
+                    content: ['../鍏敤鍩虹璧勬枡/Add_Edit_Gy_MouldType.html?hID=' + TagId + '&Level=' + Level + ''],
+                 
                 });
-                return false;//杩欓噷鍔犱釜return false;灏变笉浼氫袱娆℃彁浜�
-            })
+              
+            }
 
             //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {
+            function set_DeleteBill() {
                 var ModRightNameDelete = 'Gy_QCCheckItem_Delete'
                 if (TagId != "") {
                     layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
@@ -303,7 +334,7 @@
                                                 //淇敼涓哄姛鍚庡埛鏂扮晫闈�
                                                 window.location.reload();
                                                 //閲嶈浇tree
-                                                tree.reload('treeDepartment', {});
+                                                //tree.reload('treeDepartment', {});
                                             });
 
                                         } else {
@@ -318,10 +349,10 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
                 }
-            });
+            };
 
             //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
+            function set_ShowBill()  {
                 if (TagId != "") {
                     layer.open({
                         type: 2
@@ -373,37 +404,30 @@
                         layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                     }
                 }
-            });
-            
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and HNumber like '%" + HNumber + "%'";
-                }
-                if (HName) {
-                    sWhere += " and HName like '%" + HName + "%'";
-                }
-                $.ajax({
-                    url: GetWEBURL() + '/Gy_ModelType/list',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
-            //#endregion
+            };
+
+            ////鏌ヨ鎸夐挳
+            //form.on('submit(btnSearch)', function (data) {
+                
+            //    $.ajax({
+            //        url: GetWEBURL() + '/Gy_ModelType/list',
+            //        type: "GET",
+            //        data: { "sWhere": sWhere },
+            //        success: function (data1) {
+            //            if (data1.count == 1) {
+            //                option.data = data1.data;
+            //                table.render(option);
+            //                layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+            //            } else {
+            //                layer.alert(data1.code + data1.Message, { icon: 5 });
+            //            }
+            //        }, error: function () {
+            //            layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+            //        }
+            //    });
+            //    sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            //});
+            ////#endregion
 
             //laydate.render({
             //    elem: '#HDate'
@@ -412,47 +436,52 @@
             //    , format:'yyyy-MM-dd HH:mm'
             //});
 
-
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
-        //鏌ヨ鏍戠姸鏁版嵁
-        function getData(sWhere) {
-            var treeData;
+        ////鏌ヨ鏍戠姸鏁版嵁
+        //function getData(sWhere) {
+        //    var treeData;
 
-            $.ajax({
-                url: GetWEBURL() + '/Gy_ModelType/LoadTree',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                async: false,
-                success: function (result) {
-                    var data = result.data;
-                    //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
-                    treeData = LoadTree(data);
+        //    $.ajax({
+        //        url: GetWEBURL() + '/Gy_ModelType/LoadTree',
+        //        type: "GET",
+        //        data: { "sWhere": sWhere },
+        //        async: false,
+        //        success: function (result) {
+        //            var data = result.data;
+        //            //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+        //            treeData = LoadTree(data);
 
-                }
-            });
-            return treeData;
-        }
-        /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
-        function LoadTree(data) {
-            let map = {};
-            let treeData = [];
-            data.forEach(it => {
-                map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
-            })
-            //鐢熸垚缁撴灉闆�
-            data.forEach(it => {
-                const parent = map[it.HParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
-                if (parent) {
-                    if (!Array.isArray(parent.children)) parent.children = [];
-                    parent.children.push(it);
-                } else {
-                    treeData.push(it)
-                }
-            })
-            return treeData;
-        }
+        //        }
+        //    });
+        //    return treeData;
+        //}
+        ///**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+        //function LoadTree(data) {
+        //    let map = {};
+        //    let treeData = [];
+        //    data.forEach(it => {
+        //        map[it.id] = it;    //ID涓烘瘡涓妭鐐圭殑id
+        //    })
+        //    //鐢熸垚缁撴灉闆�
+        //    data.forEach(it => {
+        //        const parent = map[it.HParentID];   //ParentID涓虹埗鑺傜偣鐨刬d
+        //        if (parent) {
+        //            if (!Array.isArray(parent.children)) parent.children = [];
+        //            parent.children.push(it);
+        //        } else {
+        //            treeData.push(it)
+        //        }
+        //    })
+        //    return treeData;
+        //}
 
     </script>
 
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_Mould.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_Mould.html"
index 100b1bb..cefba71 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_Mould.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Gy_Mould.html"
@@ -1,15 +1,20 @@
 锘�<!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>妯″叿妗f</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+
     <script src="../../../layuiadmin/layui/layui.js"></script>
-    
+    <script src="../../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/PubCustom.js"></script>
+
 </head>
 <body>
     <div class="layui-fluid">
@@ -19,27 +24,15 @@
                     <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>
-                                    <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-inline">
-                                    <label class="layui-form-label">妯″叿缂栧彿</label>
-                                    <div class="layui-input-block">
+                                    <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="HNumber" id="HNumber">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
-                                    <label class="layui-form-label">妯″叿鍚嶇О</label>
-                                    <div class="layui-input-block">
+                                    <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>
@@ -53,14 +46,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="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_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>
@@ -68,109 +58,195 @@
             </div>
         </div>
     </div>
-    <script src="../../../layuiadmin/layui/layui.js"></script>
+  
+    <!--<script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
     <script>
         layui.config({
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
             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 = [];
 
-            var option = {
-                elem: '#mainTable'
-                //, toolbar: '#toolbarDemo'
-                ,height: 'full-50' 
-                , page: true
-                ,cellMinWidth: 90
-                , cols: [[
-                    { field: '閫夋嫨', title: '閫夋嫨', hide: true }
-                    , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
-                    , { field: '鏃ユ湡', title: '鏃ユ湡' }
-                    , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' }
-                    , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被' }
-                    , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
-                    , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿' }
-                    , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
-                    , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿' }
-                    , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸' }
-                    , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸' }
-                    , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡' }
-                    , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡' }
-                    , { field: 'HMoudType', title: 'HMoudType', hide: true }
-                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
-                    , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
-                    , { field: 'HSupID', title: 'HSupID', hide: true }
-                    , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
-                    , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
-                    , { field: 'HWhID', title: 'HWhID', hide: true }
-                    , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
-                    , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
-                    , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡' }
-                    , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
-                    , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
-                    , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�' }
-                    , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�' }
-                    , { field: '澶囨敞', title: '澶囨敞' }
-                    , { field: 'hsubid', title: 'hsubid', hide: true }
-                    , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
-                    , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
-                    , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
-                    , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
-                    , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
-                    , { field: '淇敼浜�', title: '淇敼浜�' }
-                    , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
-                    , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
-                    , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
-                    , { field: 'hbilltype', title: 'hbilltype', hide: true }
-                    , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
-                    , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
-                ]]
-            };
+            //鍒濆鍖栫晫闈�
+            set_ClearBill();
 
-            var index = layer.load(0, { shade: false });
-            //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
-            $.ajax({
-                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                url: GetWEBURL() + '/Gy_Mould/list1',
-                type: "GET",
-                data: { "sWhere": sWhere },
-                success: function (data1) {
-                    if (data1.count == 1) {
-                        option.data = data1.data;
-                        table.render(option);
-                        layer.close(index);
-                    } else {
-                        layer.close(index);
-                        layer.alert(data1.code + data1.Message, { icon: 5 });
-                    }
-                }, error: function () {
-                    layer.close(index);
-                    layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                }
-            }); 
+            //#endregion
 
-            //閲嶇疆鎸夐挳
+            //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+            //#region 澶村伐鍏锋爮浜嬩欢
+
+            table.on('toolbar(mainTable)', function (obj) {
+                switch (obj.event) {
+                    ////鏂板
+                    //case 'set_AddNew': set_AddNew();
+                    //    break;
+                    //缂栬緫
+                    case 'set_ShowBill': set_ShowBill();
+                        break;
+                    //鍒犻櫎
+                    case 'set_DeleteBill': set_DeleteBill();
+                        break;
+                    //鍒锋柊
+                    case 'get_Refresh': get_Refresh();
+                        break;
+                    //閫�鍑烘寜閽�
+                    case 'get_Exit': Pub_Close(2);
+                        break;
+                };
+            });
+            //#endregion
+
+            //#region 閲嶇疆鎸夐挳
             form.on('submit(btnReSearch)', function (data) {
+                set_ClearQuery();
+            });
+            //#endregion
+
+            //#region 鏌ヨ鎸夐挳
+            form.on('submit(btnSearch)', function (data) {
+                get_FastQuery();
+            });
+            //#endregion
+
+            //#endregion
+
+            //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
+
+            //#region 鍒濆鍖栫晫闈�
+            function set_ClearBill() {
+                //鍒濆鍖栬〃鏍�
+                set_InitGrid();
+                //鏌ヨ
+                get_Display(sWhere);
+            }
+            //#endregion
+            function set_InitGrid() {
+                option = {
+                    elem: '#mainTable'
+                    , toolbar: '#toolbarDemo'
+                    , height: 'full-50'
+                    , page: true
+                    , cellMinWidth: 90
+                    , cols: [[
+                        { type: 'checkbox', fixed: 'left' }
+                        ,{ field: '閫夋嫨', title: '閫夋嫨', hide: true }
+                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+                        , { field: '鏃ユ湡', title: '鏃ユ湡' ,width: 170 }
+                        , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 170}
+                        , { field: '妯″叿鍝佺被', title: '妯″叿鍝佺被', width: 185}
+                        , { field: '妯″叿鐘舵��', title: '妯″叿鐘舵��' }
+                        , { field: '妯″叿缂栧彿', title: '妯″叿缂栧彿', width: 125}
+                        , { field: '妯″叿鍚嶇О', title: '妯″叿鍚嶇О' }
+                        , { field: '妯″叿鍨嬪彿', title: '妯″叿鍨嬪彿', width: 125 }
+                        , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠妯″叿瑙勬牸', width: 125 }
+                        , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆妯″叿瑙勬牸', width: 125 }
+                        , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', width: 125 }
+                        , { field: '妯″叿ERP鐗╂枡', title: '妯″叿ERP鐗╂枡', width: 125}
+                        , { field: 'HMoudType', title: 'HMoudType', hide: true }
+                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
+                        , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅' }
+                        , { field: 'HSupID', title: 'HSupID', hide: true }
+                        , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 125 }
+                        , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 125 }
+                        , { field: 'HWhID', title: 'HWhID', hide: true }
+                        , { field: '榛樿浠撳簱', title: '榛樿浠撳簱' }
+                        , { field: '榛樿浠撲綅', title: '榛樿浠撲綅' }
+                        , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', width: 125 }
+                        , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡' }
+                        , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡' }
+                        , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', width: 125 }
+                        , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', width: 125}
+                        , { field: '澶囨敞', title: '澶囨敞' }
+                        , { field: 'hsubid', title: 'hsubid', hide: true }
+                        , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺' }
+                        , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+                        , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 195}
+                        , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+                        , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 180}
+                        , { field: '淇敼浜�', title: '淇敼浜�' }
+                        , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 195 }
+                        , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+                        , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 180}
+                        , { field: 'hbilltype', title: 'hbilltype', hide: true }
+                        , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180}
+                        , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+                    ]]
+                };
+            }
+
+            //#region 鏌ヨ
+            function get_Display(sWhere) {
+                var ajaxLoad = layer.load();
+                $.ajax({
+                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+                    url: GetWEBURL() + '/Gy_Mould/list1',
+                    type: "GET",
+                    data: { "sWhere": sWhere },
+                    success: function (data1) {
+                        if (data1.count == 1) {
+                            option.data = data1.data;
+                            table.render(option);
+                            layer.close(ajaxLoad);
+                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+                        } else {
+                            layer.close(ajaxLoad);
+                            layer.alert(data1.code + data1.Message, { icon: 5 });
+                        }
+                    }, error: function () {
+                        layer.close(ajaxLoad);
+                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+                    }
+                });
+
+            }
+            //#endregion
+            //#region 蹇�熻繃婊�
+            function get_FastQuery() {
+                var HNumber = $("#HNumber").val();
+                var HName = $("#HName").val();
+                if (HNumber) {
+                    sWhere += " and 妯″叿缂栧彿 like '%" + HNumber + "%'";
+                }
+                if (HName) {
+                    sWhere += " and 妯″叿鍚嶇О like '%" + HName + "%'";
+                }
+                get_Display(sWhere);
+                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+            }
+            //#endregion
+            //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+            function set_ClearQuery() {
                 $("#HNumber").val("");
                 $("#HName").val("");
-                $("#btnSearch").click();
-            });
+                sWhere = "";
+            }
+            //#endregion
+
+            ////閲嶇疆鎸夐挳
+            //form.on('submit(btnReSearch)', function (data) {
+            //    $("#HNumber").val("");
+            //    $("#HName").val("");
+            //    $("#btnSearch").click();
+            //});
 
 
             //鍒犻櫎
-            form.on('submit(btndelete)', function (obj) {4
+            function set_DeleteBill() {
+                
                 var data = obj.data //鑾峰緱褰撳墠琛屾暟鎹�
                     , layEvent = obj.event; //鑾峰緱 lay-event 瀵瑰簲鐨勫��
                 layer.confirm('鎮ㄧ‘瀹氳鍒犻櫎鍚楋紵', {
@@ -197,56 +273,51 @@
                         layer.close(index); //鍏抽棴寮瑰眰
                     }
                 });
-            });
+            };
 
-
-            //淇敼鎸夐挳
-            form.on('submit(btnModify)', function (data) {
+            //#region 缂栬緫
+            function set_ShowBill() {
                 var checkStatus = table.checkStatus('mainTable')
                     , data = checkStatus.data;
-                layer.open({
-                    type: 2
-                    , area: ['100%', '100%']
-                    , title: '妯″叿妗f璁剧疆'
-                    , shade: 0.6 //閬僵閫忔槑搴�
-                    , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
-                    , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
-                    , content: ['Gy_Mould_Edit.html?HInterID=' + data[0].hmainid + '&HType=Modify', 'yes']
-                    , resize: false
-                })
-            });
-
-
-            //鏌ヨ鎸夐挳
-            form.on('submit(btnSearch)', function (data) {
-                var HNumber = $("#HNumber").val();
-                var HName = $("#HName").val();
-                if (HNumber) {
-                    sWhere += " and 妯″叿缂栧彿 like '%" + HNumber + "%'";
+                if (checkStatus.data.length === 1) {
+                    var linterid = data[0].hmainid.toString;
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '妯″叿妗f璁剧疆-缂栬緫'
+                        , shift: 0//寮瑰嚭鍔ㄧ敾
+                        , content: '../妯℃不鍏风鐞�/Gy_Mould_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                    })
+                } else {
+                    layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
                 }
-                if (HName) {
-                    sWhere += " and 妯″叿鍚嶇О like '%" + HName + "%'";
-                }
-                $.ajax({
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
-                    url: GetWEBURL1() + '/Gy_Mould/list1',
-                    type: "GET",
-                    data: { "sWhere": sWhere },
-                    success: function (data1) {
-                        if (data1.count == 1) {
-                            option.data = data1.data;
-                            table.render(option);
-                            layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
-                            layer.alert(data1.code + data1.Message, { icon: 5 });
-                        }
-                    }, error: function () {
-                        layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
-                    }
-                });
-                sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
-            });
+            }
+            //#endregion
+            ////淇敼鎸夐挳
+            //function set_ShowBill() {
+            //    var checkStatus = table.checkStatus('mainTable')
+            //        , data = checkStatus.data;
+            //    layer.open({
+            //        type: 2
+            //        , area: ['100%', '100%']
+            //        , title: '妯″叿妗f璁剧疆'
+            //        , shade: 0.6 //閬僵閫忔槑搴�
+            //        , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+            //        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+            //        , content: 'Gy_Mould_Edit.html?HInterID=' + data[0].hmainid + '&HType=Modify', 'yes'
+                   
+            //    })
+            //};
 
+
+          
+            //#region 鍒锋柊
+            function get_Refresh() {
+                set_ClearQuery();
+                get_Display(sWhere);
+            }
+            //#endregion
 
             //laydate.render({
             //    elem: '#HDate'
@@ -259,7 +330,7 @@
             //浠ヤ笂鏄痩ayui妯″潡
         });
 
-        
+
 
 
     </script>

--
Gitblit v1.9.1