Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r23893 -r23896
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23893)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 23896)
@@ -404,10 +404,10 @@
+"
借出总数 | "
+"已归还数量 | "
+"未还数量 | "
- +"借出天数 | "
+ +"总借出天数 | "
+"截止目前借出天数 | "
+"借出单价(元/天) | "
- +"金额(元) | "
+ +"总金额(元) | "
+""
+"";
@@ -535,16 +535,16 @@
LODOP.ADD_PRINT_TEXT('8.7cm','21cm',"RightMargin:0.5cm","BottomMargin:1cm", "第#页/共&页");
LODOP.SET_PRINT_STYLE("ItemType",4);
//判断收费模式
- if(sstsConfig.isBorrowChargeByDayAndShow){
+ if(sstsConfig.isBorrowChargeByDayAndShow.open){
/*采取按天收费模式后,要保持旧的收费单显示的还是按次收费,在配置文件中设置一个截止时间点。
* 时间点前且已发货的收费单,显示的都是按次收费;时间点前未发货的采用按天收费;截止点后新申请的都是按天收费
*/
//如果申请时间小于配置的更新时间
- var borrowChargeByDayUpdateTime=Date.parse(new Date(revertDate(sstsConfig.borrowChargeByDayUpdateTime)));
+ var updateTime=Date.parse(new Date(revertDate(sstsConfig.isBorrowChargeByDayAndShow.updateTime)));
var tableTime=Date.parse(new Date(revertDate(table[0].time)));
- if(tableTime