Index: ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/print/printConfig.js =================================================================== diff -u -r28101 -r28128 --- ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/print/printConfig.js (.../printConfig.js) (revision 28101) +++ ssts-web/src/main/webapp/disinfectsystem/config/fjsssyy/print/printConfig.js (.../printConfig.js) (revision 28128) @@ -1114,6 +1114,41 @@ LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); } + +var recyclingInvoiceTotalConfig_fjsssyy = { + customPrint:printRecyclingInvoiceTotalConfig_GroupByTousseGroupName +} + +function printRecyclingInvoiceTotalConfig_GroupByTousseGroupName(time,obj){ + if(obj.data.length > 0){ + var headHtml = "

科室申领物品汇总单

"; + var tableHtml =""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + for(var i=0;i < obj.data.length;i++){ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + } + tableHtml += "

物品类别	名称	数量
"+(obj.data[i].tousseGroupName \|\| '')+"	"+obj.data[i].tosseName+"	"+obj.data[i].amount+"

"; + var printTimeHtml = "

打印日期： "+time+"

"; + //打印设置 + var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM')); + //打印日期 + LODOP.ADD_PRINT_HTM(80,"5%","90%","100%",printTimeHtml); + //项目内容 + LODOP.ADD_PRINT_TABLE(106,"5%","90%","100%",tableHtml); + //标题 + LODOP.ADD_PRINT_HTM(20,20,"95%",30,headHtml); + LODOP.PRINT(); + } +} + var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, @@ -1171,7 +1206,9 @@ //调拨出库单 appropriationOutList : appropriationOutListConfig, //打印器械包明细单 - tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy + tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy, + //待回收申请单，是否打印回收汇总单 + recyclingInvoiceTotal:recyclingInvoiceTotalConfig_fjsssyy }; var printerNameMapping = { '模板-明细标签' : 'Zebra GT800 - EPL (副本 1)', Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r28031 -r28128 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 28031) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 28128) @@ -298,7 +298,7 @@ params.shiftType = shiftType; } - return openModalWindowForExt(url,params, "选择用户", "1000", "750"); + return openModalWindowForExt(url,params, "选择用户"); } /** * 选择器械包分组，根据分组进行发货计划的打印 @@ -2129,7 +2129,7 @@ var parm_s_goodsId = document.getElementById('parm_s_goodsId'); parm_s_goodsType.value = ''; parm_s_goodsId.value = ''; - } + } grid.dwrReload(); } @@ -2431,7 +2431,7 @@ if (!isUndefinedOrNullOrEmpty(myObj.customPrint)) { Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printInvoicePlanSummary.do', - params : {recyclingRecordIds : invoicePlanIds}, + params : {recyclingRecordIds : invoicePlanIds,customPrintName:myObj.customPrint.name}, success : function(response, options) { var obj = Ext.decode(response.responseText); if(obj.success){