Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r23897 -r23940 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23897) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23940) @@ -389,44 +389,55 @@ remainReturn.push(remainReturnChild); } } + + //部门 + var depart=otherMsg.depart; + //仓库 + var wareHouse=otherMsg.wareHouse; + //打印时间 + var time= new Date(); + //制单人 + var applicant=otherMsg.applicant; + //处理科室 + var handleDepart=otherMsg.handleDepart; var printObj=null; //打印 var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM')); //按天收费模式的收费单格式 - var tableHtml="
类别 | " - +"序号 | " - +"名称 | " - +"规格 | " - +"借出总数 | " - +"已归还数量 | " - +"未还数量 | " - +"总借出天数 | " - +"截止目前借出天数 | " - +"借出单价(元/天) | " - +"总金额(元) | " + +"类别 | " + +"序号 | " + +"名称 | " + +"规格 | " + +"借出总数 | " + +"已归还数量 | " + +"未还数量 | " + +"总借出天数 | " + +"截止目前借出天数 | " + +"借出单价(元/天) | " + +"总金额(元) | " +"已还 | ";//"+alreadyReturn.length+" + tableHtml=tableHtml+"已还 | ";//"+alreadyReturn.length+" } - tableHtml=tableHtml+""+(v+1)+" | " - +""+alreadyReturn[v].tousseName+" | " - +"" - +" | "+alreadyReturn[v].lendAmount+" | " - +""+alreadyReturn[v].returnAmount+" | " - +"" - +" | "+alreadyReturn[v].lendDays+" | " - +"" - +" | "+alreadyReturn[v].price+" | " - +""+alreadyReturn[v].totalPrice+" | " + tableHtml=tableHtml+""+(v+1)+" | " + +""+alreadyReturn[v].tousseName+" | " + +"" + +" | "+alreadyReturn[v].lendAmount+" | " + +""+alreadyReturn[v].returnAmount+" | " + +"" + +" | "+alreadyReturn[v].lendDays+" | " + +"" + +" | "+alreadyReturn[v].price+" | " + +""+alreadyReturn[v].totalPrice+" | " +""; sum=sum+alreadyReturn[v].totalPrice; } @@ -436,100 +447,112 @@ if(remainReturn[v].remainAmount>0){ tableHtml=tableHtml+"
未还 | "; + tableHtml=tableHtml+"未还 | "; } - tableHtml=tableHtml+""+(v+1)+" | " - +""+remainReturn[v].tousseName+" | " - +"" - +" | "+remainReturn[v].lendAmount+" | " - +"" - +" | "+remainReturn[v].remainAmount+" | " - +"" - +" | "+remainReturn[v].remainDays+" | " - +""+remainReturn[v].price+" | " - +""+remainReturn[v].totalPrice+" | " + tableHtml=tableHtml+""+(v+1)+" | " + +""+remainReturn[v].tousseName+" | " + +"" + +" | "+remainReturn[v].lendAmount+" | " + +"" + +" | "+remainReturn[v].remainAmount+" | " + +"" + +" | "+remainReturn[v].remainDays+" | " + +""+remainReturn[v].price+" | " + +""+remainReturn[v].totalPrice+" | " +"
合计 | " - +"" - +" | " - +" | " - +" | " - +" | " - +" | " - +" | " - +" | " - +" | " - +" | "+Math.floor((sum)*10)/10+" | " - +"
序号 | " - +"名称 | " - +"规格 | " - +"借出数量 | " - +"借出单价(元) | " - +"金额(元) | " + +"序号 | " + +"名称 | " + +"规格 | " + +"借出数量 | " + +"借出单价(元) | " + +"金额(元) | " +""+(v+1)+" | " - +""+alreadyReturn[v].tousseName+" | " - +"" - +" | "+alreadyReturn[v].lendAmount+" | " - +""+alreadyReturn[v].price+" | " - +""+alreadyReturn[v].price*alreadyReturn[v].lendAmount+" | " + +""+(v+1)+" | " + +""+alreadyReturn[v].tousseName+" | " + +"" + +" | "+alreadyReturn[v].lendAmount+" | " + +""+alreadyReturn[v].price+" | " + +""+alreadyReturn[v].price*alreadyReturn[v].lendAmount+" | " +""; totalAmountPerUse=totalAmountPerUse+alreadyReturn[v].totalPrice; } //合计:金额 tableHtml1=tableHtml1+"
合计 | " - +"" - +" | " - +" | " - +" | " - +" | "+Math.floor((totalAmountPerUse)*100)/100+" | " - +"