Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r29833 -r29872 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29833) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29872) @@ -2726,7 +2726,36 @@ setPrinterByConfig(); // 自定义打印 if (!isUndefinedOrNullOrEmpty(configObj.customPrint)) { - configObj.customPrint(idCardInstance); + if(sstsConfig.enableIdCardInfoMaintain && idCardInstance.idCardDefinitionID){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/idCardInfoMaintainAction!getIDCardInfoMaintainListByIDCardDefinitionId.do', + params:{ + idCardDefinitionId: idCardInstance.idCardDefinitionID, + status: '启用', + type: 'IDCardQuestionMaintain' + }, + success : function(response, options){ + var res = Ext.util.JSON.decode(response.responseText); + var idCardQuestionList = []; + for(var i=0;i"; tableHtml += ""; } + + if(idCardQuestionList && idCardQuestionList.length > 0){ + tableHtml += ""; + tableHtml += "标识牌信息："; + tableHtml += ""; + for(var i=0;i"; + tableHtml += ""; + } + } tableHtml += ""; @@ -2903,7 +2944,6 @@ return; } doGetLodop(); - //材料明细表格的默认位置定义 var tableTop = 0; var tableLeft = 21; @@ -2931,7 +2971,8 @@ var description = idCardInstance.description; var idCardPaperType = idCardInstance.idCardPaperType; var idNumber = idCardInstance.idNumber; - var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit,idCardPaperType,description,idNumber); + var idCardQuestionList = idCardInstance.idCardQuestionList || []; + var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit,idCardPaperType,description,idNumber,idCardQuestionList); var tableHtml = ret.tableHtml + ""; //条码，打印人和时间和器械数量 if(barcode != '' && userName != '' && date != ''){ @@ -2956,7 +2997,7 @@ tableHtml += ""; tableHtml += ""; tableHtml += "

***需要回收，切勿丢失***

"; - + LODOP.ADD_PRINT_HTM(tableTop,tableLeft,tableWidth,tableHeight,""+tableHtml+""); LODOP.PRINT(); }