Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js
===================================================================
diff -u -r14373 -r14374
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js (.../printConfig.js) (revision 14373)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js (.../printConfig.js) (revision 14374)
@@ -198,8 +198,8 @@
rowsPerPage : 14,
headerContent : [
// 标题
- {label : "东莞东华医院部门领货凭证", dataIndex : 'header', fontSize : 17, position : ["15","1%","99%",5],type: 'html', beforeStr: "
"},
- {label : "去向:", dataIndex : 'depart', fontSize : 10, position : ["55","5%","90%",5]},
+ {label : "东莞东华医院器械仓库领用出库单", dataIndex : 'header', fontSize : 17, position : ["15","1%","99%",5],type: 'html', beforeStr: ""},
+ {label : "接收科室:", dataIndex : 'depart', fontSize : 10, position : ["55","5%","90%",5]},
{label : "单号:", dataIndex : 'serialNum', fontSize : 10, position : ["55","25%","90%",5]},
{label : "日期:", dataIndex : 'printTime', fontSize : 10, position : ["55","41%","90%",5]},
{label : "备注:", dataIndex : 'remark', fontSize : 10, position : ["55","65%","90%",5]}
@@ -226,7 +226,15 @@
{label : " 发货人:", dataIndex : 'printUser'}
//{label : "提交时间:", dataIndex : 'applicationTime'}
]
- }
+ },
+ barcodes : [
+ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","74%","40mm","8mm"],
+ styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
+ {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
+ {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
+ ]
+ }
+ ]
}
var batchPrintMaterialInvoicesConfig = {
@@ -272,21 +280,21 @@
var batchPrintInvoicesConfig = {
headerFooter : [
// 页眉名称
- {label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]},
+ //{label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]},
// 标题
- {label : "器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
- {label : "部门:", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
- {label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
- {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]},
- {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","35%","90%",5]},
- {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]},
- {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.3cm","5%","90%",5]},
- {label : "发货人:", dataIndex : '', fontSize : 11, position : ["8.3cm","40%","90%",5]},
- {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.3cm","75%","90%",5]},
+ {label : "东莞东华医院器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["5","25%","99%",5]},
+ {label : "接收科室:", dataIndex : 'depart', fontSize : 11, position : ["42","2%","90%",5]},
+ {label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]},
+ {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]},
+ {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["65","35%","90%",5]},
+ {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["65","2%","90%",5]},
+ {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.9cm","5%","90%",5]},
+ {label : "发货人:", dataIndex : '', fontSize : 11, position : ["8.9cm","30%","90%",5]},
+ {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.9cm","55%","90%",5]},
//{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]},
//{label : "审核人:", dataIndex : '', fontSize : 11, position : ["11cm","40%","90%",5]},
{barcodes : [
- {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
+ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","74%","40mm","8mm"],
styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
{itemNameID: 0, styleName: 'FontSize', styleValue: 6},
{itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
@@ -298,7 +306,7 @@
totalPageAmount : {label : "共&页", fontSize : 11, position : ["8.9cm","81%","90%",5]},
goodsTable :{
rowHeight : 25,
- position : ["100","1%","20.5cm","6.5cm"],
+ position : ["85","0.2cm","20.5cm","6.5cm"],
headRepeat : true,
fontSize:10,
columns : [