Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r22812 -r22880 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 22812) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 22880) @@ -491,30 +491,29 @@ return ""; } function printWaitRecyclingInvoicePlanSummary(printDateTime,printUser,recyclingDetail){ - var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); - LODOP.SET_PRINT_STYLE("FontSize",17); - LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"回收汇总清单"); - LODOP.SET_PRINT_STYLE("FontSize",11); - LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printUser); - LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"打印时间：" + printDateTime); - - var htmlTable =""; - var departmentGroupNames = recyclingDetail.departmentGroupNames - for(var i = 0; i < departmentGroupNames.length;++i){ - //科室分组 - htmlTable += ""; + function recyclingDetail_default(printSummaryObj){ + var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); + LODOP.SET_PRINT_STYLE("FontSize",17); + LODOP.ADD_PRINT_TEXT(5,300,"100%",5,"回收汇总清单"); + LODOP.SET_PRINT_STYLE("FontSize",11); + LODOP.ADD_PRINT_TEXT(35,50,"100%",5,"制单人： " + printSummaryObj.printUser); + LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"打印时间：" + printSummaryObj.printDateTime); + + var htmlTable ="

"; - htmlTable += buildDepartTable(recyclingDetail,departmentGroupNames[i]); - htmlTable += "

"; + var departmentGroupNames = printSummaryObj.recyclingDetail.departmentGroupNames + for(var i = 0; i < departmentGroupNames.length;++i){ + //科室分组 + htmlTable += ""; + } + htmlContent = "" + htmlTable + ""; + LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent); } - //备注 -// htmlTable += ""; - - - htmlContent = "" + htmlTable + ""; - LODOP.ADD_PRINT_HTM(55,5,"100%","100%",htmlContent); - + var printSummaryObj = {printDateTime:printDateTime,printUser:printUser,recyclingDetail:recyclingDetail}; + formTypeOfPrinted = "recyclingDetail"; + printSummaryObj.printConfigObj_default = {customPrint:recyclingDetail_default}; + print2(printSummaryObj); //直接打印 LODOP.PRINT(); }

"; + htmlTable += buildDepartTable(printSummaryObj.recyclingDetail,departmentGroupNames[i]); + htmlTable += "

"; -// htmlTable += buildRemarkTable(recyclingDetail.remarks,"备注"); -// htmlTable += "