Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r23402 -r23418 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23402) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23418) @@ -1744,9 +1744,10 @@ fixed:true, headerFooter : [ // 页眉名称 + {label : "器械包总数:", dataIndex : 'total', fontSize : 15, position : ["1cm","85%","99%",5]} ], - currentPageNumber : {label : "第#页", fontSize : 9, position : ["1cm","80%","90%",5]}, - totalPageAmount : {label : "共&页", fontSize : 9, position : ["1cm","85%","90%",5]}, + currentPageNumber : {label : "第#页", fontSize : 9, position : ["1cm","75%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 9, position : ["1cm","80%","90%",5]}, goodsTable :{ rowHeight : 20, //position : ["50","1%","96%","6.0cm"], @@ -1755,16 +1756,16 @@ headRepeat : true, donotPrintTotal:true,//不打印合计 columns : [ - {header : "科室", dataIndex : 'depart', width : '160px', align : 'center'}, - {header : "供应商", dataIndex : 'supplierName', width : '160px', align : 'center'}, + {header : "科室", dataIndex : 'depart', width : '150px', align : 'center'}, + {header : "供应商", dataIndex : 'supplierName', width : '150px', align : 'center'}, //{header : "出库仓库", dataIndex : 'warehouseName', width : 60, align : 'center'}, {header : "器械包", dataIndex : 'tousseName', width : '160px', align : 'center'}, {header : "拆包名称", dataIndex : 'splitTousseName', width : '160px', align : 'center'}, {header : "数量", dataIndex : 'amount', width : '50px', align : 'center'}, {header : "配包人", dataIndex : 'packer', width : '50px', align : 'center'}, {header : "审核人", dataIndex : 'reviewer', width : '50px', align : 'center'}, {header : "装配时间", dataIndex : 'packTimeStr', width : '80px', align : 'center'}, - {header : "材料汇总", dataIndex : 'foreignMaterialsAmount', width : '160px', align : 'center'}, + {header : "材料汇总", dataIndex : 'foreignMaterialsAmount', width : '130px', align : 'center'}, {header : "医生", dataIndex : 'doctor', width : '70px', align : 'center'} ] }