Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26822 -r27441
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26822)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 27441)
@@ -3126,7 +3126,8 @@
LODOP.NEWPAGE();
}
}else{
- totalPage = parseInt(totalPage);
+ //totalPage = parseInt(totalPage);
+ totalPage = 1;
createReturnMaterialRecord(title,operator,returnTime,depart,remark,returnTousseItems,1,1);
}
if(printType == 0){//直接打印
@@ -3171,27 +3172,29 @@
tableHtml += "
"+reindex+" | "+materialName+" | "+price+" | "+amount+" | "+(price*amount)+" |
";
}
currentPage = pageIndex;
+ var marginTop = "265";
if(pageIndex == totalPage){
tableHtml += " | 合计 | | "+returntotalAmount+" | "+returntotalPrice+" |
";
returntotalAmount = 0;
returntotalPrice = 0.0;
returnSerNumber = 0;
currentPage = 1;
+ marginTop = "285";
}
}
tableHtml = tableHtml + "";
LODOP.ADD_PRINT_TABLE("55","2%","90%","3000",tableHtml);
- LODOP.ADD_PRINT_TEXT("265","2%","90%",5,"科室确认:");
- LODOP.ADD_PRINT_TEXT("265","25%","90%",5,"备注: "+remark);
+ LODOP.ADD_PRINT_TEXT(marginTop,"2%","90%",5,"科室确认:");
+ LODOP.ADD_PRINT_TEXT(marginTop,"25%","90%",5,"备注: "+remark);
var date = new Date();
var thisMinute = date.getMinutes();
if(thisMinute<10){
thisMinute = "0" + thisMinute;
}
var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
- LODOP.ADD_PRINT_TEXT("265","40%","90%",5,"打印日期: "+retval);
- LODOP.ADD_PRINT_TEXT("265","75%","90%",5,"第"+pageIndex+"页/共"+totalPage+"页");
+ LODOP.ADD_PRINT_TEXT(marginTop,"40%","90%",5,"打印日期: "+retval);
+ LODOP.ADD_PRINT_TEXT(marginTop,"75%","90%",5,"第"+pageIndex+"页/共"+totalPage+"页");
};