Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r31191 -r31707 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31191) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 31707) @@ -231,7 +231,7 @@ // 自定义打印 if (!isUndefinedOrNullOrEmpty(myObj.customPrint)) { myObj.customPrint(printSummaryObj); - return; + return; } var foreignTousseList = printSummaryObj.foreignTousseList || []; //LODOP.SET_PRINT_STYLE("ItemType",0); @@ -2814,8 +2814,9 @@ alert('包定义不能为空!'); return null; } + var newIdNumber = ((idNumber || '') == '')?(tousseDefinition.idNumber || ''):''; var name = tousseDefinition.name || ''; - var nameWithIdNumber = name + (idNumber || ''); + var nameWithIdNumber = name + (newIdNumber || ''); var tableHtml = ""; tableHtml += ""; tableHtml += ""; @@ -2827,9 +2828,9 @@ tableHtml += ""; } tableHtml += ""; - if(sstsConfig.printIdNumberOnSeperateRow && ((idNumber || '') !== '')){//SZYK-14:新增配置项 + if(sstsConfig.printIdNumberOnSeperateRow && ((newIdNumber || '') !== '')){//SZYK-14:新增配置项 tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; } tableHtml += "
"+(unit || '')+"
"+name+"
编号:"+idNumber+"
编号:"+newIdNumber+"
"; @@ -2972,6 +2973,7 @@ var packageType = idCardInstance.tousseDefinition.packageType; var sterilisationAbbreviation = idCardInstance.tousseDefinition.sterilisationAbbreviation || ''; var sterilingMethod = (sterilisationAbbreviation == '')? idCardInstance.tousseDefinition.sterilingMethod:sterilisationAbbreviation; + var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit,idCardPaperType,description,idNumber,idCardQuestionList); var tableHtml = ret.tableHtml + ""; //条码,打印人和时间和器械数量