Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r28805 -r28811 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 28805) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 28811) @@ -535,8 +535,8 @@ Ext.getCmp('containerName').setVisible(false); Ext.getCmp('containerName').getEl().up('.x-form-item').setDisplayed(false); Ext.getCmp('addQualityMonitoringForm').remove('itemsFieldSet'); + hideExtractCheckMaterial(); Ext.getCmp('addQualityMonitoringForm').doLayout(); - showExtractCheckMaterial(); } /** @@ -670,7 +670,6 @@ }else if(result.data.scope == "材料"){ Ext.getCmp('sterilizationRecordInfo').setVisible(false); Ext.getCmp('tousseInfoFieldSet').setVisible(true); - showExtractCheckMaterial(); hideFirstTousse(); //hideMaterialOrTousseOrTousseMaterial(); hideExtractCheckTousse();//要 @@ -718,7 +717,7 @@ //showExtractCheckTousseAndMaterialWrapper(); showFirstTousse(); showFirstMaterial(); - showExtractCheckMaterial();//要 + //hideExtractCheckMaterial();//要 //隐藏器械包信息块材料 hideExtractCheckMaterialWrapper(); hideExtractCheckTousse();//要 @@ -743,7 +742,6 @@ Ext.getCmp('tousseInfoFieldSet').setVisible(true); hideFirstTousse(); showFirstMaterial(); - showExtractCheckMaterial(); // Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true); Ext.getCmp('recycleC').setVisible(false); Ext.getCmp('repackingC').setVisible(false); @@ -756,6 +754,7 @@ // 隐藏器械包信息 Ext.getCmp('tousseInfoFieldSet').setVisible(false); } + //hideExtractCheckMaterial(); } // 新建质量监测单,数量默认为1 var tAmount = Ext.getCmp('tousseAmount').getValue(); @@ -914,9 +913,6 @@ success : function(response,options){ var result = Ext.decode(response.responseText); if(result.success){ - hideExtractCheckMaterial(); - Ext.getCmp('material').setValue(''); - Ext.getCmp('materialAmount').setValue(""); //1、设置“器械包名称”、“器械包实例条码”、“器械包实例id”、“器械包类型”、“是否需要回收”、“责任人” if(tempBarcode != null && tempBarcode != ''){ if(isScan == true){ @@ -1393,20 +1389,6 @@ } } -function showExtractCheckMaterial(){ - if(materialItemCount > 0){ - for(var m =1;m 0){