Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r24963 -r26084 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 24963) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 26084) @@ -245,28 +245,28 @@ fixed : true,//表格宽度固定 headerFooter : [ // 标题 - {label : "中山大学附属第一医院", dataIndex : '', position : ["0","1%","99%",5],type: 'html', beforeStr: "
", afterStr: "
"}, - {label : "供应室出库清单", dataIndex : '', position : ["30","1%","99%",5],type: 'html', beforeStr: "
", afterStr: "
"}, - {label : "科室:", dataIndex : 'depart', fontSize : 16, position : ["60","5%","90%",5]}, - {label : "日期:", dataIndex : 'applicationTime', fontSize : 16, position : ["60","35%","90%",5]}, - {label : "单号:", dataIndex : 'serialNum', fontSize : 16, position : ["60","75%","90%",5]}, - {label : "配包人:", dataIndex : '', fontSize : 13, position : ["8cm","5%","90%",5],onlyLast:true}, - {label : "发货人:", dataIndex : '', fontSize : 13, position : ["8cm","25%","90%",5],onlyLast:true}, - {label : "领物人:", dataIndex : '', fontSize : 13, position : ["8cm","55%","90%",5],onlyLast:true}, + {label : "中山大学附属第一医院", dataIndex : '', position : ["0","33%","99%",5],fontSize : 16}, + {label : "供应室出库清单", dataIndex : '', position : ["30","38%","99%",5],fontSize : 16}, + {label : "科室:", dataIndex : 'depart', fontSize : 16, position : ["60","2%","90%",5]}, + {label : "日期:", dataIndex : 'applicationTime', fontSize : 16, position : ["60","32%","90%",5]}, + {label : "单号:", dataIndex : 'serialNum', fontSize : 16, position : ["60","72%","90%",5]}, + {label : "配包人:", dataIndex : '', fontSize : 13, position : ["8cm","2%","90%",5],onlyLast:true}, + {label : "发货人:", dataIndex : '', fontSize : 13, position : ["8cm","27%","90%",5],onlyLast:true}, + {label : "领物人:", dataIndex : '', fontSize : 13, position : ["8cm","52%","90%",5],onlyLast:true}, {barcodes : [ - {codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","70%","40mm","8mm"], + {codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","78%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: false}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} ] } ]} ], - currentPageNumber : {label : "第#页 ", fontSize : 11, position : ["8cm","75%","90%",5]}, - totalPageAmount : {label : " / 共#页", fontSize : 11, position : ["8cm","80%","90%",5]}, + currentPageNumber : {label : "第#页 ", fontSize : 11, position : ["8cm","79%","90%",5]}, + totalPageAmount : {label : " / 共#页", fontSize : 11, position : ["8cm","84%","90%",5]}, goodsTable :{ - rowHeight : 25, - position : ["85","8%","99%","5cm"], + rowHeight : '25pt', + position : ["85","5%","600","5cm"], fontSize : 18, headRepeat : true, columns : [ @@ -395,22 +395,22 @@ var foreignProxyDisinfectionApplicationPrintConfig = { headerFooter : [ // 页眉名称 - {label : "中山大学附属第一医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "中山大学附属第一医院", dataIndex : '', fontSize : 13, position : ["5","0%","90%",5]}, // 标题 - {label : "外部代理灭菌单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, - {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, - {label : "录入部门：", dataIndex : 'currentOrgUnitName', fontSize : 11, position : ["55","35%","90%",5]}, - {label : "流水号：", dataIndex : 'serialNumber', fontSize : 11, position : ["55","70%","90%",5]}, - {label : "申请时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","70%","90%",5]}, - {label : "送来时间:", dataIndex : 'arrivedTime', fontSize : 11, position : ["80","2%","90%",5]}, - {label : "预约时间:", dataIndex : 'scheduleTime', fontSize : 11, position : ["80","35%","90%",5]}, + {label : "外部代理灭菌单", dataIndex : '', fontSize : 16, position : ["20","35%","99%",5]}, + {label : "申请科室：", dataIndex : 'depart', fontSize : 13, position : ["55","0%","90%",5]}, + {label : "录入部门：", dataIndex : 'currentOrgUnitName', fontSize : 13, position : ["55","33%","90%",5]}, + {label : "流水号：", dataIndex : 'serialNumber', fontSize : 13, position : ["55","68%","90%",5]}, + {label : "申请时间:", dataIndex : 'applicationTime', fontSize : 13, position : ["80","68%","90%",5]}, + {label : "送来时间:", dataIndex : 'arrivedTime', fontSize : 13, position : ["80","0%","90%",5]}, + {label : "预约时间:", dataIndex : 'scheduleTime', fontSize : 13, position : ["80","33%","90%",5]}, - {label : "制表者:", dataIndex : 'printUser', fontSize : 11, position : ["415","5%","90%",5]}, - {label : "发物者:", dataIndex : '', fontSize : 11, position : ["415","40%","90%",5]}, - {label : "领物者:", dataIndex : '', fontSize : 11, position : ["415","75%","90%",5]}, - {label : "送物者:", dataIndex : '', fontSize : 11, position : ["445","5%","90%",5]}, - {label : "接收员工:", dataIndex : '', fontSize : 11, position : ["445","40%","90%",5]}, - {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["445","70%","90%",5]}, + {label : "制表者:", dataIndex : 'printUser', fontSize : 13, position : ["8cm","0%","90%",5]}, + {label : "发物者:", dataIndex : '', fontSize : 13, position : ["8cm","25%","90%",5]}, + {label : "领物者:", dataIndex : '', fontSize : 13, position : ["8cm","50%","90%",5]}, + //{label : "送物者:", dataIndex : '', fontSize : 13, position : ["8cm","5%","90%",5]}, + //{label : "接收员工:", dataIndex : '', fontSize : 13, position : ["8cm","40%","90%",5]}, + //{label : "打印时间:", dataIndex : 'printTime', fontSize : 13, position : ["8cm","70%","90%",5]}, {barcodes : [ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, @@ -420,21 +420,22 @@ } ]} ], - currentPageNumber : {label : "第#页", fontSize : 11, position : ["475","75%","90%",5]}, - totalPageAmount : {label : "共&页", fontSize : 11, position : ["475","81%","90%",5]}, + currentPageNumber : {label : "第#页", fontSize : 13, position : ["8cm","79%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 13, position : ["8cm","85%","90%",5]}, goodsTable :{ rowHeight : 25, - position : ["100","1%","97%","7cm"], + position : ["100","0%","97%","7cm"], headRepeat : true, + fontSize : 18, columns : [ - {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11}, - {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11}, - {header : "数量", dataIndex : 'amount', width : 40, align : 'right', fontSize : 11}, - {header : "单位", dataIndex : 'unit', width : 40, align : 'center', fontSize : 11}, - {header : "灭菌日期", dataIndex : 'sterilizationdate', width : 105, align : 'center', fontSize : 11}, - {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11}, - {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11}, - {header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11} + {header : "序号", dataIndex : 'serialNumber', width : '8%', align : 'center'}, + {header : "名称", dataIndex : 'name', width : '26%', align : 'left'}, + {header : "数量", dataIndex : 'amount', width : '8%', align : 'center'}, + {header : "单位", dataIndex : 'unit', width : '8%', align : 'center'}, + {header : "灭菌日期", dataIndex : 'sterilizationdate', width : '15%', align : 'center'}, + {header : "失效日期", dataIndex : 'expireDate', width : '15%', align : 'center'}, + {header : "单价", dataIndex : 'price', width : '10%', align : 'right'}, + {header : "金额", dataIndex : 'rowPrice', width : '10%', align : 'right'} ] } };