Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r17270 -r17276 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 17270) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 17276) @@ -208,7 +208,18 @@ // 打印消毒物品以及材料明细 var printLabelOfDisinfection = function(tousseObj){ addDepartPrefixForTousseName(tousseObj); - var pageType = tousseObj.pageType; + // 消毒物品的标签类型要从祖先定义重新获取 + var barcodes = tousseObj.barcodes; + var jsonObj = ""; + DWREngine.setAsync(false); + PackingTableManager.getMaterialByBarcode(barcodes[0],function(result){ + jsonObj = Ext.decode(result); + }); + DWREngine.setAsync(true); + var pageType = jsonObj.barcodePaperType; + if(isUndefinedOrNullOrEmpty(pageType)){ + pageType = tousseObj.pageType; + } if(isPageTypeConfigured(tousseObj.tousseType,pageType) || isTemplatePageType(pageType)){ // alert(tousseObj.isTraceable)