Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r14317 -r14408 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14317) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14408) @@ -493,7 +493,19 @@ onScannedTousseAmountChanged(); } +function clearScanText(){ + var barcodeEnd = Ext.getCmp("barcodeEnd").getValue().Trim(); +// if(barcodeEnd == '') + { + if(hiddenEndBarcode || currentScanMode == 'single'){ + Ext.getCmp('barcode').setValue("");//如果未使用虚拟篮筐机制或者使用篮筐机制但扫描模式为单个扫描,扫描成功后需要清除该文本内容 + }else{ + Ext.getCmp('barcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 + } + } +} + Ext.onReady(function() { var myData = []; @@ -1162,6 +1174,7 @@ var isExist = Ext.getCmp('forReviewGrid').getStore().find('barcode', Ext.getCmp('barcode').getValue().trim()); if(isExist==-1){ var barcode = Ext.getCmp('barcode').getValue(); + clearScanText(); ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode,function(jsonStr){ var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; @@ -1202,11 +1215,7 @@ virtualBasketSeqNum:obj.virtualBasketSeqNum }); Ext.getCmp('forReviewGrid').getStore().insert(0,tousseInstance); - if(hiddenEndBarcode || currentScanMode == 'single'){ - Ext.getCmp('barcode').setValue("");//如果未使用虚拟篮筐机制或者使用篮筐机制但扫描模式为单个扫描,扫描成功后需要清除该文本内容 - }else{ - Ext.getCmp('barcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 - } + clearScanText(); onScannedTousseAmountChanged();// 待审核包数量数量变化处理 speaker.speak(obj.tousseName); } else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留)