Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r19603 -r19767 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19603) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19767) @@ -237,7 +237,7 @@ }); } -function loadIdCardByBarcode(tempBarcode){ +function loadIdCardByBarcode(tempBarcode,manualScan){ var barcode = tempBarcode; PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){ @@ -255,6 +255,13 @@ showResult('不存在该标识牌对应的装配任务!'); return; } + // 加载器械包信息 + if(manualScan){ + var tousseName = idCardTaskNode.get('tousseName'); + var vedioName = idCardTaskNode.get('uuid_vedioNames'); + var td_id = idCardTaskNode.get('tousseID'); + loadTousseInfo(tousseName,imageType_tousse,vedioName,td_id); + } // 取消选中所有的装配任务,只选中该标识牌的 uncheckAllExceptCurrentIDCardPackingTask(); currentIDCardInfo = result.idCard; @@ -888,7 +895,7 @@ name : 'idCardBarcode' },{ columnWidth : .5, - hidden : true, + hidden : sstsConfig.disableIdCard, xtype : 'textfield', id : 'scanIdCardBarcode', fieldLabel : "标识牌条码", @@ -899,14 +906,14 @@ listeners : { specialkey : function(thiz, e){ if(e.getKey() == 13){ - loadIdCardByBarcode(thiz.getValue()); + loadIdCardByBarcode(thiz.getValue(),true); thiz.setValue(); } } } },{ columnWidth : .5, - hidden : true, + hidden : sstsConfig.disableIdCard, xtype : 'textfield', fieldLabel : '标识牌', componentCls:'formItemMgn', @@ -3036,7 +3043,7 @@ var idCardBarcodeTemp = record.get("idCardBarcode"); if(idCardBarcodeTemp != ""){ - loadIdCardByBarcode(idCardBarcodeTemp); + loadIdCardByBarcode(idCardBarcodeTemp,false); } refreshErrorAndDamageRemark(record); refreshRecyclingItemRemark(record); @@ -3337,7 +3344,7 @@ } var idCardBarcodeTemp = record.get("idCardBarcode"); if(idCardBarcodeTemp != ""){ - loadIdCardByBarcode(idCardBarcodeTemp); + loadIdCardByBarcode(idCardBarcodeTemp,false); }else{ Ext4.getCmp('idCardName').setValue(""); Ext4.getCmp('idCardUseAmount').setValue("");