Index: ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js =================================================================== diff -u -r12332 -r14011 --- ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js (.../recycle.js) (revision 12332) +++ ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js (.../recycle.js) (revision 14011) @@ -1778,19 +1778,9 @@ ContainerTableManager.getBasketByBarcodeAndProcedures(barcode,basketAllowProcedure,function(jsonStr){ var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; - if(returnType=="basketNotFound"){ - //条码不存在 - showResult("找不到该篮筐或清洗架"); - }else if(returnType=="basketBeUsed"){ - //篮筐已被使用 - Ext.MessageBox.confirm("确认框", "【"+obj.containerName+"】内有器械未装配,是否继续使用该篮筐?", function(btn) { - if(btn == 'yes'){ - Ext.getCmp('basketBarcode').setValue(barcode); - Ext.getCmp('basketName').setValue(obj.containerName); - packagePutInBasket(); - } - }); - }else if(returnType=="success"){ + if(!obj.success){ + showResult(obj.message); + }else{ Ext.getCmp('basketBarcode').setValue(barcode); Ext.getCmp('basketName').setValue(obj.containerName); packagePutInBasket();