Index: ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js =================================================================== diff -u -r15598 -r15599 --- ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js (.../printRecyclingConfigForm2.js) (revision 15598) +++ ssts-web/src/main/webapp/disinfectsystem/printRecyclingConfig2/printRecyclingConfigForm2.js (.../printRecyclingConfigForm2.js) (revision 15599) @@ -399,17 +399,17 @@ columns : [{ text: '名称', dataIndex : 'name', - width : 130, + width : 110, editor: 'textfield' },{ text: '打印模板', dataIndex : 'printTemplate', - width : 100, + width : 180, editor: 'textfield' },{ text : '打印类型列表', dataIndex : 'tousseTypesForDisplay', - width : 500 + width : 450 }], autoExpandColumn : 'tousseTypesForDisplay', listeners : { Index: ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java =================================================================== diff -u -r15598 -r15599 --- ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java (.../PrintSummaryVo.java) (revision 15598) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/print/vo/PrintSummaryVo.java (.../PrintSummaryVo.java) (revision 15599) @@ -249,6 +249,6 @@ } public void setPrintTemplate(String printTemplate) { - this.printTemplate = printTemplate; + this.printTemplate = StringTools.defaultIfBlank(printTemplate, "invoicePlan"); } } Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r15598 -r15599 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 15598) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 15599) @@ -168,7 +168,8 @@ rowsPerPage : 8, headerContent : [ // 标题 - {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]}, + {label : "无菌物品领用单 ", dataIndex : 'header',type:'html', beforeStr:'
',afterStr:'
', position : ["0","0mm","80%",22]}, +// {label : "无菌物品领用单 ", dataIndex : 'header', fontSize : 17, position : ["0","60mm","99%",22]}, {label : "单号:", dataIndex : 'serialNum', fontSize : 11, position : ["30","1%","90%",10]}, {label : "接收部门:", dataIndex : 'depart', fontSize : 11, position : ["30","45mm","90%",5]}, {label : "收物者:", dataIndex : '', fontSize : 11, position : ["30","100mm","90%",5]}, @@ -197,7 +198,7 @@ ] }, barcodes : [ - {codeType : "128Auto", dataIndex : 'serialNum', position : ["0.5mm","74%","40mm","7mm"], + {codeType : "128Auto", dataIndex : 'serialNum', position : ["0.5mm","77%","40mm","7mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}