From be8b558b89a89deb3aa871fc2ddaacb7fb2197bd Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 16 十月 2023 09:25:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/Baseset/基础资料/Gy_EmployeeList.html | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 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..a1e2c6f 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"
@@ -29,7 +29,7 @@
</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,27 @@
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;
+ case "HManager": //杩斿洖涓荤
+ parent.GetHManagerValue(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,8 +116,11 @@
, { field: 'HItemID', width: 150, title: '鑱屽憳ID', hide: true }
, { field: 'HNumber', width: 150, title: '鑱屽憳浠ｇ爜' }
, { field: 'HName', width: 150, title: '鑱屽憳鍚嶇О', sort: true }
+ , { field: 'HEmpRate', width: 150, title: '鑱屽憳绯绘暟', sort: true }
]]
- , page: true
+ , page: true
+ , limits: [50, 500, 5000, 50000],
+ limit: 50
});
///鍔犺浇鏄剧ず鏁版嵁
function RoadQuery(Where, HGroupID) {
@@ -119,7 +140,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