From 0b00f4e910d52fc70e109d5e51aaab1ac2c8cd22 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期六, 03 十二月 2022 15:54:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

---
 WebTM/views/Baseset/基础资料/Gy_EmployeeList.html |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 309389b..79c155f 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -22,14 +22,14 @@
                                 <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="璇疯緭鍏ヨ繃婊ゅ垪" class="layui-input">
                             </div>
                             <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">蹇�熸煡璇�</button>
-                            <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>
+                            <!--<button type="button" lay-submit="" class="layui-btn" lay-filter="FH">杩斿洖</button>-->
                         </div>
                     </div>
                 </form>
             </div>
         </div>
     </div>
-    <table class="layui-hide" id="ck-table"></table>
+    <table class="layui-hide" id="mainTable"></table>
     <script src="../../../layuiadmin/layui/layui.js"></script>
     <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
     <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -54,13 +54,17 @@
             , layer = layui.layer;
 
             form.on('submit(HQuery)', function () {//閫夋嫨浠撳簱
-                //var sMainStr = JSON.stringify(table.cache['ck-table']);
+                //var sMainStr = JSON.stringify(table.cache['mainTable']);
                 RoadQuery($('#Value').val(), 0);
             });
             form.on('submit(FH)', function () {//閫夋嫨浠撳簱
-                //var sMainStr = JSON.stringify(table.cache['ck-table']);
-                var checkStatus = table.checkStatus('ck-table')
-                 , data = checkStatus.data;
+                var index = parent.layer.getFrameIndex(window.name);
+                var checkStatus = table.checkStatus('mainTable')
+                    , data = checkStatus.data;
+                if (data.length == 0) {
+                    parent.layer.close(index);
+                    return;
+                }
                 switch (Type) {
                     case "HKeeper":  //杩斿洖淇濈
                         parent.GetHKeeperValue(data);
@@ -83,13 +87,24 @@
                     case "HWorker5":  //杩斿洖鎿嶄綔宸�5
                         parent.GetHWorkerValue5(data);
                         break;
+                    case "HWorker6":  //杩斿洖鎿嶄綔宸�6
+                        parent.GetHWorkerValue6(data);
+                        break;
+                    case "HWorker7":  //杩斿洖鎿嶄綔宸�7
+                        parent.GetHWorkerValue7(data);
+                        break;
+                    case "HWorker8":  //杩斿洖鎿嶄綔宸�8
+                        parent.GetHWorkerValue8(data);
+                        break;
+                    case "HEmp":  //杩斿洖鑱屽憳
+                        parent.GetHEmpValue(data);
+                        break;
                 }
-                var index = parent.layer.getFrameIndex(window.name);
                 parent.layer.close(index);
             });
             RoadQuery($('#Value').val(), 0);
             table.render({
-                elem: '#ck-table'
+                elem: '#mainTable'
                 // , url: '/demo/table/user/'
                , data: []
               , cellMinWidth: 80 //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
@@ -98,6 +113,7 @@
                 , { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
                 , { field: 'HNumber', width: 150, title: '鑱屽憳浠g爜' }
                 , { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
+                , { field: 'HEmpRate', width: 150, title: '鑱屽憳绯绘暟', sort: true }
               ]]
               , page: true
             });
@@ -119,7 +135,7 @@
                     //data: { "Value": Value },
                     success: function (result) {
                         ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
-                        table.reload('ck-table', {
+                        table.reload('mainTable', {
                             data: ajaxReturnData
                             , height: 'full-10'
                             , loading: false

--
Gitblit v1.9.1