Parcourir la source

修复班别页面数据显示错误

wangpx il y a 1 an
Parent
commit
16ba47bcd8

BIN
src/main/webapp/favicon.ico


+ 4 - 1
src/main/webapp/yw/hr/attendance/report/listAttendanceRecordResultManagerByMonth.jsp

@@ -192,6 +192,9 @@
 		var leaveColums = [];
 		//请假信息
 	    for(var i = 0; i < objs.length; i++){
+			if (objs[i].dvalue == '99') {
+				continue;
+			}
 	    	leaveColums.push({
 				display : objs[i].dname,
 				name : 'leave_'+objs[i].dvalue,
@@ -220,7 +223,7 @@
 	    	
 	    }
 	    columns.push({display : '请假(小时)',columns:leaveColums});
-		
+		console.log('columns', columns)
 		if("${ruleMap.allcount}" > 0){//迟到
 			var lateColums = [];
 			if ("${ruleMap.late_enable1}" == 1) {//迟到1

+ 1 - 1
src/main/webapp/yw/hr/attendance/segment/editSegment.jsp

@@ -401,7 +401,7 @@
 						<br/>
 						<input type="checkbox" <c:if test="${attendanceRuleSet.late_enable5 == '1' }">checked="checked"</c:if> id="chk5" name="attendanceRuleSet.late_enable5"
 									disabled="disabled" value="1"></>&nbsp;迟到时间段5:
-							<span id="late_or_early4" style="width: 30px;">${requestScope.attendanceRuleSet.late_or_early4}</span>&nbsp;分钟&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+							<span id="late_or_early5" style="width: 30px;">${requestScope.attendanceRuleSet.late_or_early5}</span>&nbsp;分钟&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 							早退时间:
 							<span id="late_or_early6">${requestScope.attendanceRuleSet.late_or_early6}</span>&nbsp;分钟
 						<br/>

+ 1 - 1
src/main/webapp/yw/hr/attendance/segment/viewSegment.jsp

@@ -286,7 +286,7 @@
 						<br/>
 						<input type="checkbox" <c:if test="${attendanceRuleSet.late_enable5 == '1' }">checked="checked"</c:if> id="chk5" name="attendanceRuleSet.late_enable5"
 									disabled="disabled" value="1"></>&nbsp;迟到时间段5:
-							<span id="late_or_early4" style="width: 30px;">${requestScope.attendanceRuleSet.late_or_early4}</span>&nbsp;分钟&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+							<span id="late_or_early5" style="width: 30px;">${requestScope.attendanceRuleSet.late_or_early4}</span>&nbsp;分钟&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 							早退时间:
 							<span id="late_or_early6">${requestScope.attendanceRuleSet.late_or_early6}</span>&nbsp;分钟
 						<br/>