Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js =================================================================== diff -u -r20041 -r20044 --- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js (.../printConfig.js) (revision 20041) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js (.../printConfig.js) (revision 20044) @@ -876,30 +876,35 @@ LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM')); var rowHeight = 20; - var tableHtml =""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; - tableHtml += "
"+name+"
"; -// tableHtml += "
"; + + var css="table{margin:0px;padding:0px;width: 100%; height: 100%; border-collapse: collapse;table-layout:fixed;}"; + css+="tr{padding:0px;margin:0px;height:20px;}td{padding:0px;margin:0px;border:1px solid black;font-size: 14px;text-align:center;}"; + css+="td.name{font-size: 20px;font-weight:bold;}td.thin{width:10%;text-align:right;}td.fat{width:40%;text-align:left;}td.inner{border-width:0px;}"; + css+="table.chld td{border-top-width: 0px;text-align:center;}table.chld td.fat{width:35%;}table.chld td.thin{width:11%;}table.chld td.first{width:8%;}"; + var tableHtml =""; + tableHtml +=""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; var toolsAmount = 0; @@ -912,24 +917,24 @@ toolsAmount += parseInt(gds.amount); } } - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; tableHtml += ""; - var goodsTable = "
"+name+""; tableHtml += "
住院号:"+hospitalNumber+"床号:"+bedNumber+"
住院号:"+hospitalNumber+"床号:"+bedNumber+"
病人姓名:"+patient+"医生姓名:"+doctor+"
病人姓名:"+patient+"医生姓名:"+doctor+"
厂家:"+supplierName+"
厂家:"+supplierName+"
工具件数:"+toolsAmount+"
工具件数:"+toolsAmount+"
"; - goodsTable += ""; + var goodsTable = "
"; + goodsTable += ""; var rowCount = parseInt((goodsTableItem.length + 3) / 2); //有一行表头 if(goodsTableItem.length == 0){ //没有植入物 rowCount = 2;//一行表头,一行空行 } var minRowCount = 10; - goodsTable += "" - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; + goodsTable += "" + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; goodsTable += ""; for(var i = 0; i < goodsTableItem.length;i+=2){ var gds1 = goodsTableItem[i]; @@ -942,19 +947,19 @@ gd2Name = gds2.name; gd2Amount = gds2.amount; } - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; goodsTable += ""; } function addEmptyRow(){ - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; - goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; + goodsTable += ""; goodsTable += ""; } if(goodsTableItem.length == 0){ @@ -970,11 +975,11 @@ goodsTable += "
植入物材料名称数量材料名称数量植入物材料名称数量材料名称数量
"+getDefaultString(gd1Name," ")+""+getDefaultString(gd1Amount," ")+""+getDefaultString(gd2Name," ")+""+getDefaultString(gd2Amount," ")+"
"+getDefaultString(gd1Name," ")+""+getDefaultString(gd1Amount," ")+""+getDefaultString(gd2Name," ")+""+getDefaultString(gd2Amount," ")+"
    
    
"; tableHtml += "
"+goodsTable+""+goodsTable+"
"; - LODOP.ADD_PRINT_HTM(0,0,"100%","100%",""+tableHtml+""); + tableHtml += ""; + LODOP.ADD_PRINT_HTM(0,0,"100%","100%",tableHtml); // LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page"); } var foreignTousseLargeLabelConfig = {