Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r25149 -r25177 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 25149) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 25177) @@ -2487,7 +2487,21 @@ var materials = []; if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){ - materials = tousseDefinition.materialInstances; + materials = materials.concat(tousseDefinition.materialInstances); + /* 2018-12-19 新增打印一次性物品 */ + for(var i=0;i"; if(i==total-1 && !isEven){ - tableHtml += ""; - tableHtml += ""; + tableHtml += " "; + tableHtml += " "; }else{ var record2 = materials[i+total]; var materialName2 = record2.materialDefinition.name; @@ -2584,7 +2598,6 @@ tableHtml += "***需要回收，切勿丢失***"; tableHtml += ""; tableHtml += ""; - LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); LODOP.PRINT(); }