Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js =================================================================== diff -u -r15850 -r15873 --- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js (.../printConfig.js) (revision 15850) +++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js (.../printConfig.js) (revision 15873) @@ -387,15 +387,15 @@ // 标题 {label : "江门市人民医院 供应室物资领用出库单", dataIndex : '', fontSize : 15, position : ["15","25%","99%",5]}, {label : "接收科室:", dataIndex : 'depart', fontSize : 11, position : ["57","2%","90%",5]}, - {label : "日期:", dataIndex : 'printDate', fontSize : 11, position : ["57","33%","90%",5]}, + {label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["57","23%","90%",5]}, //{label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]}, //{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]}, - {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["57","75%","90%",5]}, + {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["57","65%","90%",5]}, {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["8.4cm","5%","90%",5]}, {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8.4cm","35%","90%",5]}, {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.4cm","50%","90%",5]}, - {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.4cm","65%","90%",5]}, + {label : "申请人:", dataIndex : 'applicant', fontSize : 11, position : ["8.4cm","65%","90%",5]}, //{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]}, {label : "审核人:", dataIndex : '', fontSize : 11, position : ["8.4cm","80%","90%",5]}, {barcodes : [ @@ -407,8 +407,8 @@ } ]} ], - currentPageNumber : {label : "页: # / ", fontSize : 11, position : ["57","55%","90%",5]}, - totalPageAmount : {label : "&", fontSize : 11, position : ["57","63%","90%",5]}, + currentPageNumber : {label : "页: # / ", fontSize : 11, position : ["57","54%","90%",5]}, + totalPageAmount : {label : "&", fontSize : 11, position : ["57","62%","90%",5]}, goodsTable :{ rowHeight : 25, position : ["85","0.2cm","20.4cm","5.6cm"], @@ -1595,11 +1595,11 @@ invoicePlan : invoicePlanPrintConfig, // 打印外部代里灭菌申请 foreignProxyDisinfectionApplication : foreignProxyDisinfectionApplicationPrintConfig, - batchPrintInvoices:batchPrintInvoicesConfig, + batchPrintInvoices:batchPrintInvoicesConfig_disposable, // 批量打印发货单(器械包),如果没有配置,则跟batchPrintInvoices一样 //batchPrintInvoice_Tousse:batchPrintInvoicesConfig, // 批量打印发货单(一次性物品),如果没有配置,则跟batchPrintInvoices一样 - batchPrintInvoice_disposable:batchPrintInvoicesConfig_disposable, +// batchPrintInvoice_disposable:batchPrintInvoicesConfig_disposable, // 批量打印发货单(消毒物品),如果没有配置,则跟batchPrintInvoices一样 //batchPrintInvoice_disinfect:batchPrintInvoicesConfig, batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig,