Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r26073 -r26074
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26073)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26074)
@@ -3081,20 +3081,22 @@
tableHtml = tableHtml + "
序号 | 物品名称 | 单价 | 数量 | 金额 |
";
if(returnTousseItems != null && returnTousseItems.length > 0){
var index = 0;
+ var reindex = (pageIndex-1)*7;//当前页
for ( var i = 0; i < returnTousseItems.length; i++) {
var materialName = returnTousseItems[i].materialName;
var amount = returnTousseItems[i].amount;
var price = returnTousseItems[i].price;
returntotalAmount += parseInt(amount,10);
returntotalPrice += parseFloat(returnTousseItems[i].settlementPrice);
index = i+1;
+ reindex = reindex + 1;
if(index == returnTousseItems.length && pageIndex != totalPage){
returnSerNumber += index;
}
if(currentPage != pageIndex){
index = returnSerNumber + index;
}
- tableHtml += ""+index+" | "+materialName+" | "+price+" | "+amount+" | "+(price*amount)+" |
";
+ tableHtml += ""+reindex+" | "+materialName+" | "+price+" | "+amount+" | "+(price*amount)+" |
";
}
currentPage = pageIndex;
if(pageIndex == totalPage){