Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r33871 -r33899 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 33871) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 33899) @@ -540,10 +540,8 @@ Ext.getCmp('addExtractCheckMaterialBtnC').setVisible(true); Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false); Ext.getCmp('sterilizationRecordInfo').setVisible(false); - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - // 隐藏器械包信息 - Ext.getCmp('tousseInfoFieldSet').setVisible(false); - } + //FSSDERMYY-18:隐藏器械包信息 + Ext.getCmp('tousseInfoFieldSet').setVisible(false); Ext.getCmp("insertBasket").hide(); Ext.getCmp("containerNameItem").hide(); Ext.getCmp('containerName').setVisible(false); @@ -571,11 +569,9 @@ var result = Ext.decode(response.responseText); if(result.success){ Ext.getCmp('scope').setValue(result.data.scope); - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - if("无" == result.data.scope){ - // 如果监测范围为无,隐藏器械包信息 - Ext.getCmp('tousseInfoFieldSet').setVisible(false); - } + if(result.data.scope == '无'){ + //FSSDERMYY-18:隐藏器械包信息 + Ext.getCmp('tousseInfoFieldSet').setVisible(false); } Ext.getCmp('optionAmount').setValue(''); var baseInfoPanel = Ext.getCmp('baseInfoPanel'); @@ -793,10 +789,8 @@ //Ext.getCmp('addExtractCheckTousse').setVisible(false); //Ext.getCmp('addExtractCheckMaterial').setVisible(true); Ext.getCmp('sterilizationRecordInfo').setVisible(false); - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - // 隐藏器械包信息 - Ext.getCmp('tousseInfoFieldSet').setVisible(false); - } + //FSSDERMYY-18:隐藏器械包信息 + Ext.getCmp('tousseInfoFieldSet').setVisible(false); resetRecycleAndRepackingValue(); } // 新建质量监测单,数量默认为1 @@ -2869,11 +2863,9 @@ Ext.getCmp("formDefinitionId").setValue(result.data.formDefinition.id); Ext.getCmp('handleDepart').setValue(result.data.formDefinition.handleDepart); } - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - if("无" == result.data.scope){ - // 如果监测范围为无,隐藏器械包信息 - Ext.getCmp('tousseInfoFieldSet').setVisible(false); - } + if(result.data.scope == '无'){ + //FSSDERMYY-18:隐藏器械包信息 + Ext.getCmp('tousseInfoFieldSet').setVisible(false); } Ext.getCmp('responsibilityPart').setValue(result.data.responsibilityPart); Ext.getCmp('dateTime').setValue(Ext.util.Format.date(new Date(result.data.dateTime.time),"Y-m-d H:i"));