Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r27729 -r27759 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 27729) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 27759) @@ -1635,11 +1635,17 @@ listeners : { specialkey : function(field,e){ if(e.getKey() == 13){ - var result = getTousseInstanceMsg(field.getValue()); + var result = getTousseInstanceMsg(field.getValue()); if(result != null){ // 获取条码成功 // 设置器械包名称,器械包条码,器械包id,器械包类型 - Ext.getCmp(idpreKey+"_"+3).setValue(result.tousseName); + if(result.barcode != null && result.barcode != ''){ + Ext.getCmp(idpreKey+"_"+3).setValue(result.tousseName + "(" + result.barcode + ")"); + }else{ + Ext.getCmp('tousseName').setValue(result.tousseName); + Ext.getCmp(idpreKey+"_"+3).setValue(result.tousseName); + } + Ext.getCmp(idpreKey+"_"+5).setValue(result.tousseInstanceId); // 可以选择重新回收和重新装配 Ext.getCmp(idpreKey+"_"+2).enable(); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp =================================================================== diff -u -r27472 -r27759 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 27472) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp (.../addQualityMonitoring.jsp) (revision 27759) @@ -63,6 +63,8 @@ disableShowImageButton = false; recycleQM = true; var panel = getFormPanelContent(""); + Ext.getCmp('basketBarcodeC').setVisible(false); + Ext.getCmp('positionC').setVisible(false); otherPartAddQM = true; recycleAddQualityMonitoringDo(errorDamageQmKey); var viewport = new Ext.Viewport( {