Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r23940 -r23945
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23940)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23945)
@@ -397,7 +397,7 @@
//打印时间
var time= new Date();
//制单人
- var applicant=otherMsg.applicant;
+ var applicant=otherMsg.loginUserName;
//处理科室
var handleDepart=otherMsg.handleDepart;
@@ -437,7 +437,7 @@
+"| "+alreadyReturn[v].lendDays+" | "
+" | "
+""+alreadyReturn[v].price+" | "
- +""+alreadyReturn[v].totalPrice+" | "
+ +""+alreadyReturn[v].totalPrice+" | "
+"";
sum=sum+alreadyReturn[v].totalPrice;
}
@@ -458,7 +458,7 @@
+" | "
+""+remainReturn[v].remainDays+" | "
+""+remainReturn[v].price+" | "
- +""+remainReturn[v].totalPrice+" | "
+ +""+remainReturn[v].totalPrice+" | "
+"";
sum=sum+remainReturn[v].totalPrice;
}
@@ -476,7 +476,7 @@
+" | "
+" | "
+" | "
- +""+Math.floor((sum)*10)/10+" | "
+ +""+Math.floor((sum)*10)/10+" | "
+"";
@@ -514,7 +514,7 @@
+" | "
+""+alreadyReturn[v].lendAmount+" | "
+""+alreadyReturn[v].price+" | "
- +""+alreadyReturn[v].price*alreadyReturn[v].lendAmount+" | "
+ +""+alreadyReturn[v].price*alreadyReturn[v].lendAmount+" | "
+"";
totalAmountPerUse=totalAmountPerUse+alreadyReturn[v].totalPrice;
}
@@ -526,7 +526,7 @@
+" | "
+" | "
+" | "
- +""+Math.floor((totalAmountPerUse)*100)/100+" | "
+ +""+Math.floor((totalAmountPerUse)*100)/100+" | "
+"";
tableHtml1=tableHtml1+""