Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r35033 -r35046 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35033) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35046) @@ -3315,7 +3315,7 @@ width: 25, value: 0, anchor: '99%' - }, { + }, '-', { xtype: 'button', text: '质量监测', hidden:SSTS_QualityRecord_Create, Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r35035 -r35046 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 35035) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 35046) @@ -725,11 +725,11 @@ //隐藏监测项 hideInspectItem(); //当前选择的监测项的监测范围是“器械包”,如果重新选择的监测项的监测范围是“材料”,之前已输入的抽检器械包名称不用显示; - /* if(inspectType == "器械包"){ + if(result.data.scope == "器械包"){ //隐藏器械包信息块包 hideExtractCheckTousseWrapper(); hideMaterialOrTousseOrTousseMaterial(); - } */ + } }else if(result.data.scope == "灭菌炉记录"){ top.Ext.getCmp('sterilizationRecordInfo').setVisible(true); // 如果监测范围为灭菌炉记录,隐藏器械包信息 @@ -806,6 +806,7 @@ top.Ext.getCmp('materialAmount').setValue(1); } top.Ext.getCmp('handleDepart').setValue(result.data.handleDepart); + tousseItemCount = 0; } }, failure : function(response, options) { @@ -2466,7 +2467,7 @@ arr[i] = { barcode:tousseItems[i].data.barcode, tousseInstanceId:tousseItems[i].data.id, - tousseName:tousseItems[i].data.tousseDefinitionName, + tousseName:tousseItems[i].data.tousseDefinitionName + '('+tousseItems[i].data.barcode+')', amount:tousseItems[i].data.amount, orderNumber:i, isRecycle:'否', @@ -2485,7 +2486,7 @@ arr[i] = { barcode:tousseItems[i].data.barcode, tousseInstanceId:tousseItems[i].data.id, - tousseName:tousseItems[i].data.tousseDefinitionName, + tousseName:tousseItems[i].data.tousseDefinitionName + '('+tousseItems[i].data.barcode+')', amount:tousseItems[i].data.amount, orderNumber:(i+1), isRecycle:'否',