From 4c3a9a28d6ffee325b7a033f42abe7e2e615f964 Mon Sep 17 00:00:00 2001
From: pengyb <726475269@qq.com>
Date: Wed, 21 Aug 2024 13:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hxy-web/html/wireManager/header.html                  | 2 +-
 hxy-web/js/wireManager/header.js                      | 5 ++++-
 hxy-web/js/wireManager/wagesReport/wagesReportList.js | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

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 @@
                     </div>
                     <!-- 栏目7 -->
                     <div class="layui-tab-item">
-                        <iframe src="./wagesReport/wagesReportList.html" frameborder="0" width="100%"
+                        <iframe src="./wagesReport/wagesReportList.html" id="wagesFrame" frameborder="0" width="100%"
                         height="100%"></iframe>
                     </div>
                 </div>
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',