Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r14569 -r14799 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 14569) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 14799) @@ -2086,17 +2086,12 @@ } } } -function printIDCardLargeLabel_default(idCardInstance){ - if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){ +function buildTousseDefinitionMeterialTable(tousseDefinition,unit){ + if(isUndefinedOrNullOrEmpty(tousseDefinition)){ alert('包定义不能为空!'); - return; + return null; } - doGetLodop(); - var barcode = idCardInstance.barcode; - var date = idCardInstance.printDate; - var name = idCardInstance.tousseDefinition.name; - var userName = idCardInstance.userName; - var unit = idCardInstance.unit; + var name = tousseDefinition.name; var tableHtml = ""; tableHtml += ""; @@ -2115,8 +2110,8 @@ tableHtml += ""; var materials = []; - if(!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)){ - materials = idCardInstance.tousseDefinition.materialInstances; + if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){ + materials = tousseDefinition.materialInstances; } var total = materials.length; var isEven = true; //判断材料的数量是奇数还是偶数 @@ -2169,8 +2164,25 @@ } tableHtml += "

"; - - tableHtml += ""; + + var ret = {}; + ret.tableHtml = tableHtml; + ret.amount = amount; + return ret; +} +function printIDCardLargeLabel_default(idCardInstance){ + if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){ + alert('包定义不能为空!'); + return; + } + doGetLodop(); + var barcode = idCardInstance.barcode; + var date = idCardInstance.printDate; + var userName = idCardInstance.userName; + var unit = idCardInstance.unit; + + var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit); + var tableHtml = ret.tableHtml + "

"; //条码，打印人和时间和器械数量 if(barcode != '' && userName != '' && date != ''){ tableHtml += ""; @@ -2179,12 +2191,12 @@ tableHtml += "
"+barcode; tableHtml += ""; tableHtml += ""; - tableHtml += ""; tableHtml += ""; }else{ tableHtml += ""; - tableHtml += ""; tableHtml += ""; } @@ -2198,7 +2210,51 @@ LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); LODOP.PRINT(); } +/** + * 打印器械包管理界面的包定义的材料清单 + * @param tousseDefinitionObj 器械包定义数据对象 + * @param printType 打印类型:0为打印,其它为预览 + */ +function printTousseDefinitionMaterialsInTousseView(tousseDefinitionObj,printType) { + formTypeOfPrinted = "tousseDefinitionMaterials"; + tousseDefinitionObj.printConfigObj_default = tousseDefinitionMaterialsConfig_default;// + print2(tousseDefinitionObj); + if(printType == 0){//直接打印 + LODOP.PRINT(); + }else{//打印预览 + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + LODOP.PREVIEW(); + } +} +/** + * 器械包管理界面的包定义材料清单 + */ +var tousseDefinitionMaterialsConfig_default = { + customPrint:printTousseDefinitionMaterialsWithUnitNameAndTips +} +function printTousseDefinitionMaterialsWithUnitNameAndTips(tousseDefinitionObj){ + if(isUndefinedOrNullOrEmpty(tousseDefinitionObj)){ + alert('包定义不能为空!'); + return; + } + doGetLodop(); + var ret = buildTousseDefinitionMeterialTable(tousseDefinitionObj,tousseDefinitionObj.unit); + + var tableHtml = ret.tableHtml + "

器械总数量:"+amount+"件"; + tableHtml += "		器械总数量:"+ret.amount+"件"; tableHtml += "
器械总数量:"+amount+"件"; + tableHtml += "				器械总数量:"+ret.amount+"件"; tableHtml += "

"; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + + //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += "

器械总数量:"+ret.amount+"件"; + tableHtml += "
*需要回收，切勿丢失*

"; + + LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); +} /** * 打印器械包材料清单 * @param tousseDefinitionObj 器械包定义数据对象