Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r20568 -r20582 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 20568) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 20582) @@ -1427,11 +1427,12 @@ var tousse = printSummaryObj.tousses && printSummaryObj.tousses.length > 0?printSummaryObj.tousses[0]:{}; var tousseName = tousse.tousseName?tousse.tousseName:" "; var splitNumber = tousse.splitNumber?tousse.splitNumber:" "; + var printAmount = tousse.printAmount?tousse.printAmount:0; var materials = tousse.materials && tousse.materials.length>0?tousse.materials:[]; var goods = []; for(var i = 0; i < materials.length;++i){ - if(materials[i].tousseName){ //tousseName是 undefined、false、'', 都是false + if(materials[i].tousseName && materials[i].amount > 0){ //tousseName是 undefined、false、'', 都是false goods.push(materials[i].tousseName); } } @@ -1460,8 +1461,13 @@ tableHtml += "
包含物:
"+details+"
包份数:
"+splitNumber+"
"; tableHtml += ""; tableHtml += ""; + var i = 0; + do{ + LODOP.NEWPAGE(); + LODOP.ADD_PRINT_HTM("0", "0", "100%", "100%", tableHtml); + ++i; + }while(i < printAmount) - LODOP.ADD_PRINT_HTM("0", "0", "100%", "100%", tableHtml); } var foreignTousseAppliationPrintConfig = { customPrint:printForeignTousseApp_zsyy, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r20559 -r20582 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 20559) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 20582) @@ -178,7 +178,8 @@ 'tools':tools, 'implants':implants, 'materials':materials, - 'splitNumber':n.get('splitNumber') + 'splitNumber':n.get('splitNumber'), + 'printAmount':n.get('printAmount') }; tousses.push(tousse); var materialNodes = n.childNodes;