Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js =================================================================== diff -u -r16840 -r16842 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16840) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js (.../sterilizationLoadingForm.js) (revision 16842) @@ -315,12 +315,13 @@ //入筐器械包列表是否正在刷新中 var reviewedPanelRefreshing = false; /** - * 扫描条码及装载至灭菌筐 + * 扫描条码或点击各表格里的载入按钮装载至灭菌筐 * (原SterileLoadingTableManager.getResultJsonStrByBarcode的dwr请求与/disinfectSystem/tousseInstanceAction!addToBasket的Ext的ajax请求合并到一起) - * @param barcode 所扫描条码 + * @param barcode 所扫描或载入的物品条码 + * @param mode 方式:scanBarcode表示扫描,为空表示载入 * */ -function scanBarcodeAndAddToBasket(barcode){ +function scanBarcodeAndAddToBasket(barcode , mode){ //灭菌篮筐条码 var basketBarcode = Ext.getCmp('basketBarcode').getValue(); SterileLoadingTableManager.scanBarcodeAndAddTousseToBasket(barcode,getTousseStoreBarcodes(),basketBarcode,function(jsonStr){ @@ -400,7 +401,10 @@ if(enableBeginEndBarcodeScan == false || currentScanMode == 'single'){ //Ext.getCmp('barcode').setValue(''); }else{ - Ext.getCmp('barcodeEnd').focus(); + //如果模式为扫描条码时,则让条码(尾)获得焦点 + if(mode == 'scanBarcode'){ + Ext.getCmp('barcodeEnd').focus(); + } } var currentTousseInstance = new tousseInstanceRecord({ @@ -734,7 +738,7 @@ showResult('条码不能为空'); return; } - scanBarcodeAndAddToBasket(barcode); + scanBarcodeAndAddToBasket(barcode , 'scanBarcode'); /*SterileLoadingTableManager.getResultJsonStrByBarcode(barcode,getTousseStoreBarcodes(),Ext.getCmp('basketBarcode').getValue(),function(jsonStr){ console.log('barcode2='+barcode+','+new Date().format('y-m-d H:i:s') + '.' + new Date().getMilliseconds());