Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringInstanceForm.js =================================================================== diff -u -r31458 -r33890 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 31458) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoringWithNoLogon/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 33890) @@ -485,11 +485,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'); @@ -611,10 +609,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); hideExtractCheckMaterial(); } // 新建质量监测单,数量默认为1 @@ -1363,11 +1359,9 @@ }else{ Ext.getCmp("formDefinitionId").setValue(result.data.formDefinition.id); } - 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")); Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r33868 -r33890 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 33868) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 33890) @@ -599,12 +599,11 @@ top.Ext.getCmp('scope2').setValue(result.data.scope); top.Ext.getCmp('optionAmount2').setValue(''); var items = new Array(); - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - if('无' == result.data.scope){ - hideQualityMonitoringTousseMsg(); - }else{ - showQualityMonitoringTousseMsg(); - } + //FSSDERMYY-18:隐藏器械包信息 + if(result.data.scope == '无'){ + hideQualityMonitoringTousseMsg(); + }else{ + showQualityMonitoringTousseMsg(); } // 如果显示炉次炉号,添加表单 @@ -1029,12 +1028,11 @@ // top.Ext.getCmp('tousseInstanceId2').setValue(result.data.tousseDefinitionId); top.Ext.getCmp('remark2').setValue(result.data.remark); top.Ext.getCmp('optionAmount2').setValue(''); - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - if('无' == result.data.scope){ - hideQualityMonitoringTousseMsg(); - }else{ - showQualityMonitoringTousseMsg(); - } + //FSSDERMYY-18:隐藏器械包信息 + if(result.data.scope == '无'){ + hideQualityMonitoringTousseMsg(); + }else{ + showQualityMonitoringTousseMsg(); } // 如果显示炉次炉号,添加表单 @@ -1336,11 +1334,8 @@ showTousseAndMaterialMsg(); top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); }else if(result.data.scope == "无"){ - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - hideTousseAndMaterialMsg(); - }else{ - showTousseAndMaterialMsg(); - } + //FSSDERMYY-18:隐藏器械包信息 + hideTousseAndMaterialMsg(); top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); }else if(result.data.scope == "灭菌炉记录"){ hideTousseAndMaterialMsg(); @@ -2010,11 +2005,8 @@ showTousseAndMaterialMsg(); top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); }else if(result.data.scope == "无"){ - if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){ - hideTousseAndMaterialMsg(); - }else{ - showTousseAndMaterialMsg(); - } + //FSSDERMYY-18:隐藏器械包信息 + hideTousseAndMaterialMsg(); top.Ext.getCmp('sterilizationRecordInfo').setVisible(false); }else if(result.data.scope == "灭菌炉记录"){ hideTousseAndMaterialMsg(); Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js =================================================================== diff -u -r32407 -r33890 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js (.../qualitymonitoringInstanceForReviewViewForm.js) (revision 32407) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForReviewViewForm.js (.../qualitymonitoringInstanceForReviewViewForm.js) (revision 33890) @@ -525,10 +525,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); Ext.getCmp("insertBasket").hide(); Ext.getCmp("containerNameItem").hide(); Ext.getCmp('containerName').setVisible(false); @@ -556,11 +554,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'); @@ -684,10 +680,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); hideExtractCheckMaterial(); } // 新建质量监测单,数量默认为1 @@ -1498,11 +1492,9 @@ }else{ Ext.getCmp("formDefinitionId").setValue(result.data.formDefinition.id); } - 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"));