Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r25628 -r25751 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 25628) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 25751) @@ -455,6 +455,7 @@ var barcode = tempBarcode; PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){ var result = JSON.parse(resultJsonStr); + if(isUndefinedOrNullOrEmpty(result.errorMsg)){ barcode = result.idCard.barcode; var tousseName = result.idCard.tousseDefinition.name; @@ -539,8 +540,14 @@ Ext4.getCmp('idCardBarcode').setValue(barcode); Ext4.getCmp('idCardName').setValue(tousseName + "(条码:" + barcode + ")"); Ext4.getCmp('idCardUseAmount').setValue(result.idCard.idCardDefinition.useAmount); - var packageType = idCardTaskNode.get("packageType"); var sterilingType = idCardTaskNode.get("sterilingMethod"); + var packageType; + if(sstsConfig.idCardAddPackageType){//标识牌增加包装类型 + packageType = result.idCard.idCardDefinition.packageType; + }else{ + packageType = idCardTaskNode.get("packageType"); + } + Ext4.getCmp('packageType').setValue(packageType); Ext4.getCmp('sterilingType').setValue(sterilingType); //根据灭菌程序设置灭菌方式的值