Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r35462 -r35465 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 35462) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 35465) @@ -218,7 +218,7 @@ LODOP.PRINT_INIT(""); setPrinterByConfig(); LODOP.SET_PRINT_STYLE("ItemType", 4); - LODOP.SET_PRINT_PAGESIZE(0, "297mm", "210mm", ""); + LODOP.SET_PRINT_PAGESIZE(0, "210mm", "297mm", ""); var title; var table; var barAndTempTr; @@ -237,7 +237,7 @@ } else { tableHtml += "
高温灭菌记录表
"; } - tableHtml += "日期 | "; tableHtml += "锅次 | "; tableHtml += "炉号 | "; @@ -289,12 +289,12 @@ tableHtml += "干燥时间 (min) | ";
tableHtml += "结束时间 | "; tableHtml += "||||||
温度(°C) | "; tableHtml += "时间(min) | "; tableHtml += "压力(bar) | "; tableHtml += "||||||||
" + (data.yyyyMMdd || '') + " | "; tableHtml += "" + (data.cycles || '') + " | "; tableHtml += "" + (data.sterilizerName || '') + " | "; @@ -334,11 +334,11 @@ } tableHtml += "||||||||
压力值范围 | "; tableHtml += "灭菌炉最高最低温度 | "; tableHtml += "|||||||||
最高压力 | "; tableHtml += "" + (data.maxP1Mbar || '') + " | "; tableHtml += "最低压力 | "; @@ -364,10 +364,10 @@ } tableHtml += "||||||||
器械包相关情况 | "; tableHtml += "||||||||||
总数 | "; tableHtml += "" + (data.tousseAmount || '') + " | "; tableHtml += "包装质量 | "; @@ -507,10 +507,10 @@ } } } else { - tableHtml += "||||||||
灭菌物品明细 | "; tableHtml += "||||||||||
器械包名称 | "; tableHtml += "数量 | "; tableHtml += "器械包名称 | "; @@ -530,7 +530,7 @@ tousseName2 = data.tousseAmountArr[j + 1].tousseName; amount2 = data.tousseAmountArr[j + 1].amount; } - tableHtml += "||||||||
" + tousseName1 + " | "; tableHtml += "" + amount1 + " | "; tableHtml += "" + tousseName2 + " | "; @@ -551,7 +551,7 @@ tousseName2 = data.tousseAmountArr[j + 1].tousseName; amount2 = data.tousseAmountArr[j + 1].amount; } - tableHtml += "||||||||
" + tousseName1 + " | "; tableHtml += "" + amount1 + " | "; tableHtml += "" + tousseName2 + " | "; @@ -560,11 +560,11 @@ } } } - tableHtml += "||||||||
灭菌化学监测 | "; tableHtml += "备注 | "; tableHtml += "|||||||||
包内化学指示物 | "; tableHtml += "包外化学指示物 | "; tableHtml += "PCD生产批号 | "; Index: ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js =================================================================== diff -u -r35457 -r35465 --- ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js (.../printConfig.js) (revision 35457) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsly/print/printConfig.js (.../printConfig.js) (revision 35465) @@ -1697,7 +1697,7 @@ var sterilizationDetailsConfig = { title: { label: "高温灭菌记录表", fontSize: 18 }, table: { - rowHeight: 30, + rowHeight: 26, fontSize: 12, rowspan: 2,//2层表头 columns: [ @@ -1721,7 +1721,7 @@ ] }, barAndTempTr: { - rowHeight: 30, + rowHeight: 26, fontSize: 12, columns: [ { @@ -1742,7 +1742,7 @@ }, goodsInfo: { title: '器械包相关情况', - rowHeight: 30, + rowHeight: 26, fontSize: 12, columns: [{ header: "总数", dataIndex: 'tousseAmount', align: 'center', colspan: '2' @@ -1756,7 +1756,7 @@ title: '灭菌物品明细', cols: 2,//默认显示2列,最多3列 fontSize: 12, - rowHeight: 30, + rowHeight: 26, columns: [{ header: "器械包名称", dataIndex: 'tousseName', align: 'center' }, {