Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r12799 -r12908 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12799) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12908) @@ -2211,9 +2211,10 @@ 'specification': specification } print2(printSummaryObj); - return; + }else{ + creatediposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,specification); } - creatediposableGoodsInfo(barcode,name,expDate,supplierName,batchNumber,specification); + setPrinterByConfig(); if(printType == 0){//直接打印 LODOP.PRINT(); Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js =================================================================== diff -u -r12799 -r12908 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12799) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12908) @@ -519,10 +519,56 @@ var smallLabelConfig = { customPrint:printSmallLabel_fdzl } +var diposableGoodsBatchStockConfig = { + customPrint:printDisposableGoods_fdzl +} + //小标签2配置,50x30mm var smallLabel2Config = { customPrint:printSmallLabel2_fdzl } +function printDisposableGoods_fdzl(obj){ + doGetLodop(); + + // 设置默认字体 + setDefaultFontNameSizeBold('宋体',12,1); + // 默认条码属性 + LODOP.SET_PRINT_STYLE('ShowBarText', true); + LODOP.SET_PRINT_STYLE('FontSize', 6); + LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); + + var fontSize = getFontSizeByStr(obj.name,[ + {maxLen:10,fontSize:10}, + {maxLen:20,fontSize:6}, + {maxLen:1000,fontSize:4} + ]); + LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 + + LODOP.ADD_PRINT_TEXT("5mm","0mm","RightMargin:0mm","5mm","批次:" + obj.batchNumber); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 + + LODOP.ADD_PRINT_TEXT("9mm","0mm","RightMargin:0mm","5mm", "规格:" + obj.specification); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 + + LODOP.ADD_PRINT_TEXT("13mm","0mm","RightMargin:0mm","5mm", "失效期:" + obj.expDate); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 + + /*LODOP.ADD_PRINT_TEXT("6mm","1mm","34mm","6mm", ":"+obj.sterilizationDate); + setFontSizeBold(10,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("6mm","30mm","30mm","6mm", "装配:"+obj.operator); + setFontSizeBold(10,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","1mm","34mm","6mm", "失效:"+obj.validDate); + setFontSizeBold(10,0);// 设置字体 + LODOP.ADD_PRINT_TEXT("12mm","30mm","30mm","6mm", "审核:"+obj.reviewer); + setFontSizeBold(10,0);// 设置字体*/ + + LODOP.ADD_PRINT_BARCODE("17mm","12mm","30mm","10mm","128Auto", obj.barcode);// 条码1 +} function printSmallLabel_fdzl(obj){ doGetLodop(); @@ -865,5 +911,6 @@ foreignTousseAppliation : foreignTousseAppliationPrintConfig, // 标识牌 idCardLargeLabel:idCardLargeLabelConfig, - idCardSmallLabel:idCardSmallLabelConfig + idCardSmallLabel:idCardSmallLabelConfig, + diposableGoodsBatchStock:diposableGoodsBatchStockConfig }; \ No newline at end of file