Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r19166 -r19293 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 19166) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 19293) @@ -1900,33 +1900,7 @@ doGetLodop(); LODOP.PRINT_INIT(""); LODOP.SET_PRINTER_INDEX(-1); - var goodsArray = returnGoodsItems.split("#@"); - var row = 8; - if(goodsArray.length > row){ - var tempResult = ""; - for ( var i = 1; i <= goodsArray.length; i++) { - if( i%row == 0){ - if(i == goodsArray.length){ - tempResult += goodsArray[i-1]; - }else{ - tempResult += goodsArray[i-1]+"##"; - } - }else{ - if(i == goodsArray.length){ - tempResult += goodsArray[i-1]; - }else{ - tempResult += goodsArray[i-1]+"#@"; - } - } - } - var resultArray = tempResult.split("##"); - for ( var j = 0; j < resultArray.length; j++) { - createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,resultArray[j],j+1,totalPage); - LODOP.NEWPAGE(); - } - }else{ - createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,returnGoodsItems,1,1); - } + createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,returnGoodsItems,1,1); if(printType == 0){//直接打印 LODOP.PRINT(); }else{//打印预览 @@ -1937,14 +1911,11 @@ alert("打印内容为空"); } } -var returntoGoodsTalAmount = 0; -var returntoGoodsTalPrice = 0.0; -var returnGoodsSerNumber = 0; -var currentGoodsPage = 1; - function createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,returnGoodsItems,pageIndex,totalPage) { doGetLodop(); LODOP.SET_PRINT_STYLE("FontSize",17); + //页眉页脚模式 + LODOP.SET_PRINT_STYLE("ItemType",1); var titleTable = "
"+title+"一次性物品退货单
"; LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable); LODOP.SET_PRINT_STYLE("FontSize",10); @@ -1954,42 +1925,31 @@ LODOP.ADD_PRINT_TEXT("75","70%","90%",5,"备注: "+remark); var tableHtml = ""; - tableHtml = tableHtml + "" + /**/ "" + /**/""; + tableHtml = tableHtml + "" + /**/ "" + /**/""; if(returnGoodsItems != null && returnGoodsItems.length > 0){ - var returnGoodsItemsArray = returnGoodsItems.split("#@"); - var index = 0; - for ( var i = 0; i < returnGoodsItemsArray.length; i++) { - var returnGoodsItemArray = returnGoodsItemsArray[i].split("#&"); - var barcode = returnGoodsItemArray[0]; - var name = returnGoodsItemArray[1]; - var amount = returnGoodsItemArray[2]; + var returntoGoodsTalAmount = 0; + for ( var i = 0; i < returnGoodsItems.length; i++) { + var item = returnGoodsItems[i]; + + var barcode = item.barcode; + var name = item.tousseName; + var amount = item.amount; returntoGoodsTalAmount += parseInt(amount,10); - var batchNumber = returnGoodsItemArray[3]; - var price = returnGoodsItemArray[4]; - var expDate = returnGoodsItemArray[5]; - var rowTotal = returnGoodsItemArray[6]; - index = i+1; - if(index == returnGoodsItemsArray.length && pageIndex != totalPage){ - returnGoodsSerNumber += index; - } + var batchNumber = item.batchNumber; + var price = item.fluctuationPrice; + var expDate = item.expDate; + var rowTotal = item.totalPrice; - if(currentGoodsPage != pageIndex){ - index = returnGoodsSerNumber + index; - } - tableHtml = tableHtml + "" + /**/"" + /**/ ""; + tableHtml = tableHtml + "" + /**/"" + /**/ ""; } - currentGoodsPage = pageIndex; - if(pageIndex == totalPage){ - tableHtml = tableHtml + "" + /**/ ""; - returntoGoodsTalAmount = 0; - returntoGoodsTalPrice = 0.0; - returnGoodsSerNumber = 0; - currentGoodsPage = 1; - } + tableHtml = tableHtml + "" + /**/ ""; } tableHtml = tableHtml + "
序号条码物品数量批次单价(元)失效日期金额
序号条码物品数量批次单价(元)失效日期金额
"+index+""+barcode+""+name+""+amount+""+batchNumber+""+price+""+expDate+""+rowTotal+"
"+(i+1)+""+barcode+""+name+""+amount+""+batchNumber+""+price+""+expDate+""+rowTotal+"
总数量"+returntoGoodsTalAmount+""+totalMoney+"
总数量"+returntoGoodsTalAmount+""+totalMoney+"
"; - LODOP.ADD_PRINT_TABLE("95","3%","95%","3000",tableHtml); + LODOP.SET_PRINT_STYLE("ItemType",4); + LODOP.ADD_PRINT_TABLE("95","3%","95%","170",tableHtml); + //页眉页脚模式 + LODOP.SET_PRINT_STYLE("ItemType",1); LODOP.ADD_PRINT_TEXT("285","5%","90%",5,"验收人："); LODOP.ADD_PRINT_TEXT("285","20%","90%",5,"经手人: "+remark); var date = new Date(); @@ -1999,7 +1959,12 @@ } var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute; LODOP.ADD_PRINT_TEXT("285","50%","90%",5,"打印日期: "+retval); - LODOP.ADD_PRINT_TEXT("285","80%","90%",5,"第"+pageIndex+"页/共"+totalPage+"页"); + //当前页 + LODOP.SET_PRINT_STYLE("ItemType",2); + LODOP.ADD_PRINT_TEXT("285","80%","90%",5, "第#页"); + //总页数 + LODOP.SET_PRINT_STYLE("ItemType",3); + LODOP.ADD_PRINT_TEXT("285","85%","90%",5, "/ 共&页"); }; //打印一次性物品退货记录