Index: ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js =================================================================== diff -u -r28383 -r28694 --- ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js (.../printConfig.js) (revision 28383) +++ ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js (.../printConfig.js) (revision 28694) @@ -1080,7 +1080,8 @@ } var recyclingInvoiceTotalConfig_bjdxzlyy = { - customPrint:printRecyclingInvoiceTotalConfig_bjdxzlyy + customPrint:printRecyclingInvoiceTotalConfig_bjdxzlyy, + amountType:true//true表示取回收数量;false或空表示取申请数量 } function printRecyclingInvoiceTotalConfig_bjdxzlyy(time,obj){ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r28539 -r28694 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 28539) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 28694) @@ -2498,7 +2498,7 @@ if (!isUndefinedOrNullOrEmpty(myObj.customPrint)) { Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printInvoicePlanSummary.do', - params : {recyclingRecordIds : invoicePlanIds,customPrintName: (myObj.name || '')}, + params : {recyclingRecordIds : invoicePlanIds,priorityRecyclingAmount:myObj.amountType || false,customPrintName: (myObj.name || '')}, success : function(response, options) { var obj = Ext.decode(response.responseText); if(obj.success){ @@ -2743,7 +2743,7 @@ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printWaitRecyclingInvoicePlanSummary.do', params : {departmentGroupIds : departmentGroupIds}, success : function(response, options) { - var obj = Ext.decode(response.responseText); + var obj = Ext.decode(response.responseText); if(obj.success){ printWaitRecyclingInvoicePlanSummary(Ext4.Date.format(new Date(),'Y-m-d H:i:s'),obj.printUser,obj); Ext.Ajax.request({