Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r24981 -r24984
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 24981)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 24984)
@@ -706,15 +706,16 @@
//htmlTable += "
"+ recyclingDetail.supplyRoomTousse +" |
";
htmlTable += "物品名称 | 数量 | 物品名称 | 数量 | 物品名称 | 数量 | 物品名称 | 数量 | 物品名称 | 数量 |
";
var tousseCountPerRow = 5;
- var rowLineCount = (recyclingDetail.supplyRoomTousse.length + 4) / tousseCountPerRow;
- for(var i = 0;i < Math.floor(rowLineCount);i++){
- htmlTable += ""+ recyclingDetail.supplyRoomTousse[i * rowLineCount]["tousseName"] +" | "+ recyclingDetail.supplyRoomTousse[i * rowLineCount]["amount"] +" | ";
+ //总共需要显示的行数
+ var rowLineCount = Math.floor((recyclingDetail.supplyRoomTousse.length + 4) / tousseCountPerRow);
+ for(var i = 0;i < rowLineCount);i++){
+ htmlTable += "
"+ recyclingDetail.supplyRoomTousse[i * tousseCountPerRow]["tousseName"] +" | "+ recyclingDetail.supplyRoomTousse[i * tousseCountPerRow]["amount"] +" | ";
for(var j = 1;j < tousseCountPerRow;j++){
var tousseName;
var amount;
- if(recyclingDetail.supplyRoomTousse.length > (i * rowLineCount + j)){
- tousseName = recyclingDetail.supplyRoomTousse[i * rowLineCount + j]["tousseName"];
- amount = recyclingDetail.supplyRoomTousse[i * rowLineCount + j]["amount"];
+ if(recyclingDetail.supplyRoomTousse.length > (i * tousseCountPerRow + j)){
+ tousseName = recyclingDetail.supplyRoomTousse[i * tousseCountPerRow + j]["tousseName"];
+ amount = recyclingDetail.supplyRoomTousse[i * tousseCountPerRow + j]["amount"];
}else{
tousseName = " ";
amount = " ";