Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r16212 -r16258 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 16212) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 16258) @@ -1180,21 +1180,21 @@ return; } showResult('保存成功'); - var isPrint = action.result.isPrint; + var isPrint = action.result.isPrintOnDirectPacking; var isTraceable = action.result.isTraceable; var fixedBarcode = action.result.fixedBarcode; var idCardDefinitionUseAmount = action.result.idCardDefinitionUseAmount; //此处改为不管器械包定义是否打印,都打印标签 - /*if(isPrint){*/ + if(isPrint){ if(action.result.isDisinfection){//是否为消毒物品 printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode,expirationDate,action.result.packageTypeAbbreviation); }else{ printBarcode(action.result.barcode,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount); } - /*}else{ + }else{ showResult("此器械包不打印标签!"); - }*/ + } Ext.getCmp('tousseName').setValue(); Ext.getCmp('tempTousseType').setValue(); Ext.getCmp('packAmount').setValue();