Index: ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print/printConfig.js
===================================================================
diff -u -r41519 -r41521
--- ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print/printConfig.js (.../printConfig.js) (revision 41519)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xkyy/print/printConfig.js (.../printConfig.js) (revision 41521)
@@ -42,7 +42,6 @@
headerFooter : [
// 标题
{label : "广州市胸科医院出库单(供应室)", dataIndex : '', fontSize : 15, position : ["20","25%","99%",5]},
- {label : "申请人:", dataIndex : 'assistantSender', fontSize : 11, position : ["5","2%","90%",5]},
{label : "领用科室:", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]},
// {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]},
{label : "领用人:", dataIndex : '', fontSize : 11, position : ["10cm","5%","90%",5]},
@@ -147,6 +146,7 @@
var titleTable = "
";
LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable);
LODOP.SET_PRINT_STYLE("FontSize",10);
+ LODOP.ADD_PRINT_TEXT("22","5%","90%",5,"申请人: "+applicant);
LODOP.ADD_PRINT_TEXT("55","5%","90%",5,"领用科室: "+depart);
LODOP.ADD_PRINT_TEXT("55","40%","90%",5,"出库日期: " + sendTime);
LODOP.ADD_PRINT_TEXT("55","75%","90%",5,"出库单号: "+serialNumber);
@@ -219,6 +219,7 @@
var titleTable = "";
LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable);
LODOP.SET_PRINT_STYLE("FontSize",10);
+ LODOP.ADD_PRINT_TEXT("22","5%","90%",5,"申请人: "+applicant);
LODOP.ADD_PRINT_TEXT("55","5%","90%",5,"领用科室: "+depart);
var outDate = sendTime;
if(outDate != null && outDate.length > 0){
@@ -279,6 +280,7 @@
var titleTable = "";
LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable);
LODOP.SET_PRINT_STYLE("FontSize",10);
+ LODOP.ADD_PRINT_TEXT("22","5%","90%",5,"申请人: "+applicant);
LODOP.ADD_PRINT_TEXT("55","5%","90%",5,"领用科室: "+depart);
var outDate = sendTime;
if(outDate != null && outDate.length > 0){
@@ -371,6 +373,7 @@
var length3 = result.diposableGoods.length;
var serialNumber = result.serialNumber2 || '';
var sendTime = result.sendTime;
+ var applicant = result.applicant || '';
var goods = null;
var title = "";
DWREngine.setAsync(false);
@@ -416,7 +419,7 @@
var type = "器械包申请单";
if(goods != null){
- printInvoice_xkyy(title,"",serialNumber,"","",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,true);
+ printInvoice_xkyy(title,"",serialNumber,applicant,"",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,true);
}
//打印消毒物品
var goods = null;
@@ -438,7 +441,7 @@
}
type = "消毒物品申请单";
if(goods != null){
- printInvoice_xkyy(title,"",serialNumber,"","",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,false);
+ printInvoice_xkyy(title,"",serialNumber,applicant,"",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,false);
}
//打印一次性物品
var length3 = result.diposableGoods.length;
@@ -461,7 +464,7 @@
}
type = "一次性物品申请单";
if(goods != null){
- printInvoice_xkyy(title,"",serialNumber,"","",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,false);
+ printInvoice_xkyy(title,"",serialNumber,applicant,"",applicationDepart,currentUser,sendTime,"",goods,pagePrice,printType,type,false);
}
}
//11111111111111111111111111111111111111111111111111111