Эх сурвалжийг харах

考勤管理添加打卡策略

boomEgg 5 жил өмнө
parent
commit
0b70cd697e

+ 3 - 4
o2web/source/x_component_Attendance/MyIndex.js

@@ -743,7 +743,7 @@ MWF.xApplication.Attendance.MyIndex = new Class({
 
             if( this.isAskForLevel(d,"pm") ){
                 totals.levelAsked = totals.levelAsked + 0.5;
-                events.push( {  text: '请假或外出报备', start: d.recordDateString,  backgroundColor :this.statusColor.levelAsked } )
+                events.push( {  text: this.lp.index.levelAsked, start: d.recordDateString,  backgroundColor :this.statusColor.levelAsked } )
             }else if( this.isAppealSuccess(d,"pm")){
                 events.push( {  text: this.lp.appealSuccess, start: d.recordDateString,  backgroundColor :this.statusColor.appealSuccess } );
                 totals.appealSuccess = totals.appealSuccess + 0.5;
@@ -756,7 +756,7 @@ MWF.xApplication.Attendance.MyIndex = new Class({
             //    totals.leaveEarly = totals.leaveEarly + 0.5
             }else if( this.isAbsent(d,"pm")){
                     totals.noSign = totals.noSign + 0.5;
-                    events.push( {  text: '缺勤', start: d.recordDateString,  backgroundColor :this.statusColor.noSign } )
+                    events.push( {  text: this.lp.index.absent, start: d.recordDateString,  backgroundColor :this.statusColor.noSign } )
            /* }else if( this.isLackOfTime(d,"pm")){
                 events.push( {  text: this.lp.lackOfTime + ',' + this.lp.signTime + ':' + d.offDutyTime, start: d.recordDateString,  backgroundColor :this.statusColor.lackOfTime } );
                 totals.lackOfTime = totals.lackOfTime + 0.5*/
@@ -768,10 +768,9 @@ MWF.xApplication.Attendance.MyIndex = new Class({
             }else if( this.isWeekend(d, "pm") ){
                 return;
             }else{
-                console.log("============")
                 if(!!d.offDutyTime){
                     totals.normal = totals.normal + 0.5;
-                    events.push( {  text: '出勤,打卡时间:'+ d.offDutyTime, start: d.recordDateString,  backgroundColor :this.statusColor.normal } )
+                    events.push( {  text: this.lp.index.offDutyTime+ d.offDutyTime, start: d.recordDateString,  backgroundColor :this.statusColor.normal } )
                 }
 
             }

+ 2 - 2
o2web/source/x_component_Attendance/ScheduleExplorer.js

@@ -130,7 +130,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
                 onPostLoad: function(){
                     if(signProxy!=0&&signProxy!=1){
                         if(signProxy==3)
-                            this.options.height=650;
+                            this.options.height=670;
                         else
                             this.options.height=570;
                     }
@@ -155,7 +155,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
                                     if(signProxy=="3"){
                                         this.formTableArea.getElement("[lable=leaveEarlyStartTimeMorning]").getParent().setStyle("display","table-row");
                                         this.formTableArea.getElement("[lable=lateStartTimeAfternoon]").getParent().setStyle("display","table-row");
-                                        tempH = "650px";
+                                        tempH = "670px";
                                         this.form.options.itemTemplate.lateStartTimeAfternoon.notEmpty=true;
                                     }else{
                                         this.formTableArea.getElement("[lable=leaveEarlyStartTimeMorning]").getParent().setStyle("display","none");

+ 5 - 1
o2web/source/x_component_Attendance/lp/zh-cn.js

@@ -72,8 +72,12 @@ MWF.xApplication.Attendance.LP = {
 	"index" : {
 		"attendanceCalendar":"考勤日历",
 		"pieChart" : "考勤汇总",
-		"lineChart" : "上下班走势"
+		"lineChart" : "上下班走势",
+		"absent":"缺勤",
+		"offDutyTime":"出勤,打卡时间:",
+		"levelAsked":"请假或外出报备"
 	},
+
 	"schedule" : {
 		"inputVaild" : "单位、上班时间、下班时间、迟到起算时间、旷工起算时间均不能为空",
 		"setSchedule" : "排班设置",