Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r31932 -r31957
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31932)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31957)
@@ -2606,7 +2606,7 @@
doGetLodop();
LODOP.PRINT_INIT("");
LODOP.SET_PRINTER_INDEX(-1);
- createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,returnGoodsItems,1,1);
+ createReturnGoodsRecord(title,operator,returnTime,depart,remark,returnGoodsItems);
if(printType == 0){//直接打印
LODOP.PRINT();
}else{//打印预览
@@ -2617,60 +2617,163 @@
alert("打印内容为空");
}
}
-function createReturnGoodsRecord(title,operator,returnTime,depart,totalMoney,remark,returnGoodsItems,pageIndex,totalPage) {
+function createReturnGoodsRecord(title,operator,returnTime,depart,remark,returnGoodsItems) {
+ var printObj = printConfig['returnDiposableGoods'];
+ var titleName = title + "一次性物品退货单";
+ var hasHeaderPosition = false;
+ var hasHeaderContent = false;
+ var hasGoodsTable = false;
+ var hasFooter = false;
+ var isShowTalAmount = true;
+ if(!isUndefinedOrNullOrEmpty(printObj)){
+ titleName = printObj.headerContent[0].label;
+ if(!isUndefinedOrNullOrEmpty(printObj.headerPosition)){
+ hasHeaderPosition = true;
+ }
+ if(!isUndefinedOrNullOrEmpty(printObj.headerContent)){
+ hasHeaderContent = true;
+ }
+ if(!isUndefinedOrNullOrEmpty(printObj.goodsTable)){
+ hasGoodsTable = true;
+ }
+ if(!isUndefinedOrNullOrEmpty(printObj.footer)){
+ hasFooter = true;
+ }
+ if(!isUndefinedOrNullOrEmpty(printObj.isShowTalAmount)){
+ isShowTalAmount = printObj.isShowTalAmount;
+ }
+ }
doGetLodop();
LODOP.SET_PRINT_STYLE("FontSize",17);
//页眉页脚模式
LODOP.SET_PRINT_STYLE("ItemType",1);
- var titleTable = "
";
- LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable);
+ var titleTable = "";
+ if(!hasHeaderPosition){
+ LODOP.ADD_PRINT_TABLE("20","1%","99%",5,titleTable);
+ }else {
+ var position = printObj.headerPosition;
+ LODOP.ADD_PRINT_TABLE(position[0],position[1],position[2],position[3],titleTable);
+ }
LODOP.SET_PRINT_STYLE("FontSize",10);
- LODOP.ADD_PRINT_TEXT("55","5%","90%",5,"经办人员: "+operator);
- LODOP.ADD_PRINT_TEXT("55","70%","90%",5,"退货时间: " + returnTime);
- LODOP.ADD_PRINT_TEXT("75","5%","90%",5,"科室: "+depart);
- LODOP.ADD_PRINT_TEXT("75","70%","90%",5,"备注: "+remark);
+ //表格标题
+ if(!hasHeaderContent){
+ LODOP.ADD_PRINT_TEXT("55","5%","90%",5,"经办人员: "+operator);
+ LODOP.ADD_PRINT_TEXT("55","70%","90%",5,"退货时间: " + returnTime);
+ LODOP.ADD_PRINT_TEXT("75","5%","90%",5,"科室: "+depart);
+ LODOP.ADD_PRINT_TEXT("75","70%","90%",5,"备注: "+remark);
+ }else {
+ for(var i=1;i序号 | 条码 | 物品 | 数量 | 批次 | " + /*单价(元) | */ "失效日期 | " + /*金额 | */"
";
+ tableHtml += "";
+ if(!hasGoodsTable){
+ tableHtml += "序号 | 条码 | 物品 | 数量 | 批次 | 失效日期 |
";
+ }else {
+ tableHtml += "";
+ for(var i=0;i"+content.header+"";
+ }
+ tableHtml += "
";
+ }
+ tableHtml += "";
+
if(returnGoodsItems != null && returnGoodsItems.length > 0){
var returntoGoodsTalAmount = 0;
for ( var i = 0; i < returnGoodsItems.length; i++) {
var item = returnGoodsItems[i];
var barcode = item.barcode;
- var name = item.tousseName;
+ var tousseName = item.tousseName;
var amount = item.amount;
returntoGoodsTalAmount += parseInt(amount,10);
var batchNumber = item.batchNumber;
- var price = item.fluctuationPrice;
var expDate = item.expDate;
- var rowTotal = item.totalPrice;
- tableHtml = tableHtml + ""+(i+1)+" | "+barcode+" | "+name+" | "+amount+" | "+batchNumber+" | " + /*"+price+" | */""+expDate+" | " + /*"+rowTotal+" | */ "
";
+ tableHtml += "";
+ if(!hasGoodsTable){
+ tableHtml += ""+(i+1)+" | "+barcode+" | "+tousseName+" | "+amount+" | "+batchNumber+" | "+expDate+" | ";
+ }else {
+ for(var j=0;j"+(i+1)+"";
+ }else {
+ tableHtml += ""+item[content.dataIndex]+" | ";
+ }
+ }
+ }
+ tableHtml += "
";
}
- tableHtml = tableHtml + "总数量 | "+returntoGoodsTalAmount+" | | " + /*"+totalMoney+" | */ "
";
+ if(isShowTalAmount){
+ tableHtml += "总数量 | "+returntoGoodsTalAmount+" | |
";
+ }
}
- tableHtml = tableHtml + "";
+ tableHtml += "";
LODOP.SET_PRINT_STYLE("ItemType",4);
- LODOP.ADD_PRINT_TABLE("95","3%","95%","170",tableHtml);
+ if(!hasGoodsTable){
+ LODOP.ADD_PRINT_TABLE("95","3%","95%","170",tableHtml);
+ }else {
+ var position = printObj.goodsTable.position;
+ LODOP.ADD_PRINT_TABLE(position[0],position[1],position[2],position[3],tableHtml);
+ }
//页眉页脚模式
LODOP.SET_PRINT_STYLE("ItemType",1);
- LODOP.ADD_PRINT_TEXT("285","5%","90%",5,"验收人:");
- LODOP.ADD_PRINT_TEXT("285","20%","90%",5,"经手人: "+operator);
- var date = new Date();
- var thisMinute = date.getMinutes();
- if(thisMinute<10){
- thisMinute = "0" + thisMinute;
- }
- var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
- LODOP.ADD_PRINT_TEXT("285","50%","90%",5,"打印日期: "+retval);
- //当前页
- LODOP.SET_PRINT_STYLE("ItemType",2);
- LODOP.ADD_PRINT_TEXT("285","80%","90%",5, "第#页");
- //总页数
- LODOP.SET_PRINT_STYLE("ItemType",3);
- LODOP.ADD_PRINT_TEXT("285","85%","90%",5, "/ 共&页");
+ if(!hasFooter){
+ LODOP.ADD_PRINT_TEXT("285","5%","90%",5,"验收人:");
+ LODOP.ADD_PRINT_TEXT("285","20%","90%",5,"经手人: "+operator);
+ var date = new Date();
+ var thisMinute = date.getMinutes();
+ if(thisMinute<10){
+ thisMinute = "0" + thisMinute;
+ }
+ var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
+ LODOP.ADD_PRINT_TEXT("285","50%","90%",5,"打印日期: "+retval);
+ //当前页
+ LODOP.SET_PRINT_STYLE("ItemType",2);
+ LODOP.ADD_PRINT_TEXT("285","80%","90%",5, "第#页");
+ //总页数
+ LODOP.SET_PRINT_STYLE("ItemType",3);
+ LODOP.ADD_PRINT_TEXT("285","85%","90%",5, "/ 共&页");
+ }else {
+ var date = new Date();
+ var thisMinute = date.getMinutes();
+ if(thisMinute<10){
+ thisMinute = "0" + thisMinute;
+ }
+ var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
+ for(var i=0;i";
- LODOP.ADD_PRINT_TABLE("0","1%","99%",5,titleTable);
+ var titleTable = "";
+ if(!hasHeaderPosition){
+ LODOP.ADD_PRINT_TABLE("0","1%","99%",5,titleTable);
+ }else {
+ var position = printObj.headerPosition;
+ LODOP.ADD_PRINT_TABLE(position[0],position[1],position[2],position[3],titleTable);
+ }
LODOP.SET_PRINT_STYLE("FontSize",10);
- LODOP.ADD_PRINT_TEXT("35","2%","90%",5,"操作人: "+operator);
- LODOP.ADD_PRINT_TEXT("35","40%","90%",5,"退货时间: " + returnTime);
- LODOP.ADD_PRINT_TEXT("35","70%","90%",5,"科室: "+depart);
+ //表格标题
+ if(!hasHeaderContent){
+ LODOP.ADD_PRINT_TEXT("35","2%","90%",5,"操作人: "+operator);
+ LODOP.ADD_PRINT_TEXT("35","40%","90%",5,"退货时间: " + returnTime);
+ LODOP.ADD_PRINT_TEXT("35","70%","90%",5,"科室: "+depart);
+ }else {
+ for(var i=1;i序号 | 物品名称 | 单价 | 数量 | 金额 | ";
+ tableHtml += "";
+ if(!hasGoodsTable){
+ tableHtml += "序号 | 物品名称 | 单价 | 数量 | 金额 |
";
+ }else {
+ tableHtml += "";
+ for(var i=0;i"+content.header+"";
+ }
+ tableHtml += "
";
+ }
+ tableHtml += "";
+
if(returnTousseItems != null && returnTousseItems.length > 0){
var returnTousseItemsArray = returnTousseItems.split("@;");
var index = 0;
@@ -3357,12 +3519,33 @@
if(currentPage != pageIndex){
index = returnSerNumber + index;
}
-
- tableHtml += ""+index+" | "+name+" | "+price+" | "+amount+" | "+(price*amount)+" |
";
+
+ if(!hasGoodsTable){
+ tableHtml += ""+index+" | "+name+" | "+price+" | "+amount+" | "+(price*amount)+" |
";
+ }else {
+ tableHtml += "";
+ for(var j=0;j"+index+"";
+ }else if(content.dataIndex == 'name'){
+ tableHtml += ""+name+" | ";
+ }else if(content.dataIndex == 'price'){
+ tableHtml += ""+price+" | ";
+ }else if(content.dataIndex == 'amount'){
+ tableHtml += ""+amount+" | ";
+ }else if(content.dataIndex == 'totalPrice'){
+ tableHtml += ""+(price*amount)+" | ";
+ }
+ }
+ tableHtml += "
";
+ }
}
currentPage = pageIndex;
if(pageIndex == totalPage){
- tableHtml += " | 合计 | | "+returntotalAmount+" | "+returntotalPrice+" |
";
+ if(isShowTalAmount){
+ tableHtml += " | 合计 | | "+returntotalAmount+" | "+returntotalPrice+" |
";
+ }
returntotalAmount = 0;
returntotalPrice = 0.0;
returnSerNumber = 0;
@@ -3371,17 +3554,47 @@
}
tableHtml = tableHtml + "";
- LODOP.ADD_PRINT_TABLE("55","2%","90%","3000",tableHtml);
- LODOP.ADD_PRINT_TEXT("265","2%","90%",5,"科室确认:");
- LODOP.ADD_PRINT_TEXT("265","25%","90%",5,"备注: "+remark);
- var date = new Date();
- var thisMinute = date.getMinutes();
- if(thisMinute<10){
- thisMinute = "0" + thisMinute;
- }
- var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
- LODOP.ADD_PRINT_TEXT("265","40%","90%",5,"打印日期: "+retval);
- LODOP.ADD_PRINT_TEXT("265","75%","90%",5,"第"+pageIndex+"页/共"+totalPage+"页");
+ if(!hasGoodsTable){
+ LODOP.ADD_PRINT_TABLE("55","2%","90%","3000",tableHtml);
+ }else {
+ var position = printObj.goodsTable.position;
+ LODOP.ADD_PRINT_TABLE(position[0],position[1],position[2],position[3],tableHtml);
+ }
+ //页眉页脚模式
+ if(!hasFooter){
+ LODOP.ADD_PRINT_TEXT("265","2%","90%",5,"科室确认:");
+ LODOP.ADD_PRINT_TEXT("265","25%","90%",5,"备注: "+remark);
+ var date = new Date();
+ var thisMinute = date.getMinutes();
+ if(thisMinute<10){
+ thisMinute = "0" + thisMinute;
+ }
+ var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
+ LODOP.ADD_PRINT_TEXT("265","40%","90%",5,"打印日期: "+retval);
+ LODOP.ADD_PRINT_TEXT("265","75%","90%",5,"第"+pageIndex+"页/共"+totalPage+"页");
+ }else {
+ var date = new Date();
+ var thisMinute = date.getMinutes();
+ if(thisMinute<10){
+ thisMinute = "0" + thisMinute;
+ }
+ var retval = date.getFullYear()+"-"+(date.getMonth()+1)+"-"+date.getDate() +" "+date.getHours()+":"+thisMinute;
+ for(var i=0;i