Jelenléti ív nyomtatás hiba javítva
This commit is contained in:
parent
758690ecb0
commit
db5ed9f310
|
|
@ -5168,10 +5168,7 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
|
||||||
var day = moment(element.date,'YYYY.MM.DD.').day();
|
var day = moment(element.date,'YYYY.MM.DD.').day();
|
||||||
var notes="";
|
var notes="";
|
||||||
|
|
||||||
if (Object.keys(element.workReport).length!=0){
|
|
||||||
workReport=element.workReport.wt+' '+element.workReport.wf;
|
|
||||||
wrShift='\r\n'
|
|
||||||
}
|
|
||||||
if (element.dailyReport!='') drShift='\r\n'; else drShift='';
|
if (element.dailyReport!='') drShift='\r\n'; else drShift='';
|
||||||
drShift='';
|
drShift='';
|
||||||
if (element.dailyReport)
|
if (element.dailyReport)
|
||||||
|
|
@ -5201,6 +5198,10 @@ function printPage(employee,som,month,weekend,mindate,holidaysArray,sickpaysArra
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if (Object.keys(element.workReport).length!=0){
|
||||||
|
workReport=element.workReport.wt+' '+element.workReport.wf;
|
||||||
|
wrShift='\r\n'
|
||||||
|
}
|
||||||
element.notes.forEach(note=>{
|
element.notes.forEach(note=>{
|
||||||
notes+=note.userNote+' '+note.companyNote
|
notes+=note.userNote+' '+note.companyNote
|
||||||
})
|
})
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue