Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r28723 -r28787 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 28723) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 28787) @@ -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(); } /** @@ -663,13 +663,14 @@ //Ext.getCmp('addExtractCheckTousse').setVisible(true); //Ext.getCmp('addExtractCheckMaterial').setVisible(false); // 清除材料数据 - Ext.getCmp('material').setValue(""); - Ext.getCmp('materialAmount').setValue(""); + //Ext.getCmp('material').setValue(""); + //Ext.getCmp('materialAmount').setValue(""); //隐藏监测项 hideInspectItem(); }else if(result.data.scope == "材料"){ Ext.getCmp('sterilizationRecordInfo').setVisible(false); Ext.getCmp('tousseInfoFieldSet').setVisible(true); + showExtractCheckMaterial(); hideFirstTousse(); //hideMaterialOrTousseOrTousseMaterial(); hideExtractCheckTousse();//要 @@ -717,7 +718,7 @@ //showExtractCheckTousseAndMaterialWrapper(); showFirstTousse(); showFirstMaterial(); - hideExtractCheckMaterial();//要 + showExtractCheckMaterial();//要 //隐藏器械包信息块材料 hideExtractCheckMaterialWrapper(); hideExtractCheckTousse();//要 @@ -742,6 +743,7 @@ 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); @@ -754,7 +756,6 @@ // 隐藏器械包信息 Ext.getCmp('tousseInfoFieldSet').setVisible(false); } - hideExtractCheckMaterial(); } // 新建质量监测单,数量默认为1 var tAmount = Ext.getCmp('tousseAmount').getValue(); @@ -1371,9 +1372,6 @@ //显示第一个材料信息,包括器械包条码,数量 function showFirstMaterial(){ Ext.getCmp('materialC').setVisible(true); - if(Ext.getCmp('material').getValue() != ""){ - Ext.getCmp('material').setValue(""); - } Ext.getCmp('materialAmountC').setVisible(true); Ext.getCmp('addExtractCheckMaterialBtnC').setVisible(true); } @@ -1392,6 +1390,20 @@ } } +function showExtractCheckMaterial(){ + if(materialItemCount > 0){ + for(var m =1;m 0){