Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r19928 -r20041 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 19928) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 20041) @@ -1610,6 +1610,41 @@ } }; +function getForeignTousseName(recyclingPrintData){ + var nameIncludeSplitTotalAmountForSplitForeignTousse = getBoolValueFromJs("sstsConfig.nameIncludeSplitTotalAmountForSplitForeignTousse",false); + var splitForeignTousseNameStyle = getIntValueFromJs("sstsConfig.splitForeignTousseNameStyle",0); + var count = recyclingPrintData.splitCount?recyclingPrintData.splitCount:1; + var splitIndex = recyclingPrintData.splitIndex?recyclingPrintData.splitIndex:1; + var tousseName = recyclingPrintData.tousseName?recyclingPrintData.tousseName:""; + if(count > 1){ + if(nameIncludeSplitTotalAmountForSplitForeignTousse){ + tousseName += "(" + splitIndex + "/" + count + ")"; + }else{ + if(splitForeignTousseNameStyle == 1){ + tousseName += "(" + count + "-" + splitIndex + ")"; + }else{ + tousseName += "(部分" + splitIndex + ")"; + } + } + } + return tousseName; +} +/** + * 打印回收篮筐内物品。目前就外来器械会打印 + * @param recyclingPrintDatas + */ +function printRecyclingDetail(recyclingPrintDatas){ + if(recyclingPrintDatas && recyclingPrintDatas.length > 0){ + for(var i = 0; i < recyclingPrintDatas.length;++i){ + var recyclingPrintData = recyclingPrintDatas[i]; + recyclingPrintData.printTousseName = getForeignTousseName(recyclingPrintData); + formTypeOfPrinted = "recyclingGoodsDetail"; + setPrinterByConfig(); + print2(recyclingPrintData); + LODOP.PRINT(); + } + } +} // 外部代理灭菌申请单 function printForeignProxyDisinfectionApplicationInfo(foreignProxyDisinfectionApplicationObj,printType) { formTypeOfPrinted = "foreignProxyDisinfectionApplication";