Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js =================================================================== diff -u -r29132 -r29146 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 29132) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 29146) @@ -1203,22 +1203,22 @@ var printDisposableGoodsInvoicePlanSummary_gdszyy = { customPrint:printDisposableGoodsInvoicePlanSummary } -function printDisposableGoodsInvoicePlanSummary(obj){ +function printDisposableGoodsInvoicePlanSummary(obj,printType){ doGetLodop(); - LODOP.SET_PRINT_PAGESIZE(3,'24.1cm','2cm',''); - var tableStyle = "font-family: verdana, arial, sans-serif;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;margin-bottom:4mm;width: 22.1cm;"; + LODOP.SET_PRINT_PAGESIZE(3,'29.7cm','2cm',''); + var tableStyle = "font-family: verdana, arial, sans-serif;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;margin-bottom:5mm;margin-left:0.5cm;width: 28.7cm"; var tableThStyle = "border-width: 1px;padding: 5px;border-style: solid;border-color: #666666;font-size: 14px;" var tableTdStyle = "border-width: 1px;padding: 5px;border-style: solid;border-color: #666666;background-color: #ffffff;font-size: 14px;"; var tableNameStyle = "font-size: 16px;border-width: 1px;padding: 5px;border-style: solid;border-color: #666666;background-color: #ffffff;"; - var html = '

'; + var html = '

'; var data = obj.data; for(var i=0;i"; table += ''; table += ''+item.name+''; table += ''; - table += '科室/名称'; + table += '科室/名称'; for(var j=0;j'+item.content.header[j]+''; } @@ -1246,7 +1246,11 @@ html += '

'; LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+html+""); LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); - LODOP.PRINT(); + if(printType == 0){ + LODOP.PRINT(); + }else { + LODOP.PREVIEW(); + } } var printConfig = { //发货计划单