diff --git a/hxy-web/html/wireManager/header.html b/hxy-web/html/wireManager/header.html
index 2638bcd..47eb8e3 100644
--- a/hxy-web/html/wireManager/header.html
+++ b/hxy-web/html/wireManager/header.html
@@ -93,7 +93,7 @@
-
diff --git a/hxy-web/js/wireManager/header.js b/hxy-web/js/wireManager/header.js
index 0216488..380d078 100644
--- a/hxy-web/js/wireManager/header.js
+++ b/hxy-web/js/wireManager/header.js
@@ -51,8 +51,11 @@ function init(){
var attendanceFrame = $("#attendanceFrame")[0];
var attendanceWindow = attendanceFrame.contentWindow;
- attendanceWindow.init();
+ attendanceWindow.initTable1();
+ var wagesFrame = $("#wagesFrame")[0];
+ var wagesWindow = wagesFrame.contentWindow;
+ wagesWindow.init();
},
});
},
diff --git a/hxy-web/js/wireManager/wagesReport/wagesReportList.js b/hxy-web/js/wireManager/wagesReport/wagesReportList.js
index 0feb4c2..16a8236 100644
--- a/hxy-web/js/wireManager/wagesReport/wagesReportList.js
+++ b/hxy-web/js/wireManager/wagesReport/wagesReportList.js
@@ -71,12 +71,14 @@ function resetClick(){
* 初始化数据
*/
function init(){
+ var yjId = $(window.parent.document).find("input[id='taskSourceId']").attr("stationId");
// 渲染表格
table.render({
id: 'layui_table',
elem: '#table',
url: PATH_URL + '/wages/getWagesEscalationList',
where: {
+ yjId: yjId
},
page: true, //开启分页
method:'post',