Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r26057 -r26061 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26057) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 26061) @@ -514,24 +514,46 @@ var style = getTableTdStyle(myObj.goodsTable,i); var value = ""; var indexName = item.dataIndex; + tableHtml += "= 0 || indexName == "amount"){ value = printSummaryObj.totalGoodsAmount; - style = "'BORDER: #000000 1px solid; padding-right:0px;'"; - item.align = "right"; + if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && isPrintForGoodsWithBtn == true){ + //江门中心市医院要求金额和数量右对齐 + tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ; + tableHtml += value; + } + else{ + tableHtml += "'center'"; + tableHtml += " style=" + style + ">" + value; + } } else if (indexName == "applyAmount"){ value = printSummaryObj.totalApplyAmount; + tableHtml += item.align; + tableHtml += " style=" + style + ">" + value; } else if (indexName == "recyclingAmount"){ value = printSummaryObj.totalRecyclingAmount; + tableHtml += item.align; + tableHtml += " style=" + style + ">" + value; } else if(indexName == "rowPrice" || indexName == "totalPrice"){ value = formatMoney(printSummaryObj.totalPrice); - style = "'BORDER: #000000 1px solid; padding-right:0px;'"; - item.align = "right"; + if(sstsConfig && sstsConfig.alignForTotalAndAmountWithPrint == true && isPrintForGoodsWithBtn == true){ + //江门中心市医院要求金额和数量右对齐 + tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>" ; + tableHtml += value; + } + else{ + tableHtml += "'center'"; + tableHtml += " style=" + style + ">" + value; + } } - - tableHtml += "" + value + ""; + else{ + tableHtml += item.align; + tableHtml += " style=" + style + ">" + value; + } + tableHtml += ""; } tableHtml += ""; @@ -541,6 +563,8 @@ LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3],tableHtml); } + //江门中心市医院要求金额和数量右对齐的参数 + isPrintForGoodsWithBtn = false; } /** @@ -2979,6 +3003,122 @@ }; //打印器械包退货记录 +//打印材料退货记录 页码，页数 +function printReturnMaterialRecord(title,operator,returnTime,depart,totalMoney,remark,returnTousseItems,printType) { + if (returnTousseItems != null && returnTousseItems.length > 0) { + doGetLodop(); + LODOP.PRINT_INIT(""); + LODOP.SET_PRINTER_INDEX(-1); + var goodsArray = returnTousseItems; + var row = 8; + var goodsSize = goodsArray.length; + var divGoods = [];//存放每页的数据的数据，形式：[ [某页的数据数组], [某页的数据数组], [某页的数据数组], [某页的数据数组] ] + if(goodsSize > row){ + var totalPageSize = 1;//总页数 + if(goodsSize%row == 0){ + //如果刚好是每页8条 + totalPageSize = goodsSize/row; + var singlePage = [];//单页的数据 + for(var i = 0; i < goodsArray.length; i++){ + singlePage.push(goodsArray); + if((i+1)%8 == 0){ + divGoods.push(singlePage); + singlePage = []; + } + } + } + else{ + //每页8条有余 + totalPageSize = (goodsSize/row)+1; + var singlePage = [];//单页的数据 + for(var i = 0; i < goodsArray.length; i++){ + singlePage.push(goodsArray); + if((i+1)%8 == 0){ + divGoods.push(singlePage); + singlePage = []; + }else{ + //如果是最后一条数据 + if((i+1) == goodsArray.length){ + divGoods.push(singlePage); + singlePage = []; + } + } + } + } + totalPage = totalPageSize;//总页数 + for ( var j = 0; j < totalPage; j++) { + createReturnMaterialRecord(title,operator,returnTime,depart,remark,divGoods[j],j+1,totalPage); + LODOP.NEWPAGE(); + } + }else{ + createReturnMaterialRecord(title,operator,returnTime,depart,remark,returnTousseItems,1,1); + } + if(printType == 0){//直接打印 + LODOP.PRINT(); + }else{//打印预览 + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + LODOP.PREVIEW(); + } + } else { + alert("打印内容为空"); + } +} +//材料退货表格结构 +function createReturnMaterialRecord(title,operator,returnTime,depart,remark,returnTousseItems,pageIndex,totalPage) { + doGetLodop(); + LODOP.SET_PRINT_STYLE("FontSize",17); + var titleTable = "
"+title+"材料退货单
"; + LODOP.ADD_PRINT_TABLE("0","1%","99%",5,titleTable); + LODOP.SET_PRINT_STYLE("FontSize",10); + LODOP.ADD_PRINT_TEXT("35","2%","90%",5,"操作人: "+operator); + LODOP.ADD_PRINT_TEXT("35","40%","90%",5,"退货时间: " + returnTime); + LODOP.ADD_PRINT_TEXT("35","70%","90%",5,"科室: "+depart); + var tableHtml = ""; + tableHtml = tableHtml + ""; + if(returnTousseItems != null && returnTousseItems.length > 0){ + var index = 0; + 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; + if(index == returnTousseItems.length && pageIndex != totalPage){ + returnSerNumber += index; + } + if(currentPage != pageIndex){ + index = returnSerNumber + index; + } + tableHtml += ""; + } + currentPage = pageIndex; + if(pageIndex == totalPage){ + tableHtml += ""; + returntotalAmount = 0; + returntotalPrice = 0.0; + returnSerNumber = 0; + currentPage = 1; + } + } + + tableHtml = tableHtml + "
序号物品名称单价数量金额
"+index+""+materialName+""+price+""+amount+""+(price*amount)+"
合计"+returntotalAmount+""+returntotalPrice+"
"; + 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); + 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+"页"); +}; + + +//打印材料退货记录 end + //一次性物品 function printDiposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,printType,specification) { if (!isUndefinedOrNullOrEmpty(barcode)) {