Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
===================================================================
diff -u -r16052 -r16978
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp (.../routineMonitoringView.jsp) (revision 16052)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp (.../routineMonitoringView.jsp) (revision 16978)
@@ -18,6 +18,7 @@
+
@@ -53,6 +54,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r16433 -r16978
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 16433)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 16978)
@@ -64,5 +64,7 @@
//巡回护士是否允许为空
useRecordCircuitNurseAllowBlank:true,
//洗手护士是否允许为空
- useRecordWashHandNurseAllowBlank:true
+ useRecordWashHandNurseAllowBlank:true,
+ // 监测范围为无时,质量监测记录是否隐藏器械包信息
+ isInspectScopeHideTousseMsg : true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r16977 -r16978
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16977)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16978)
@@ -561,11 +561,14 @@
top.Ext.getCmp('scope2').setValue(result.data.scope);
top.Ext.getCmp('optionAmount2').setValue('');
var items = new Array();
- if('无' == result.data.scope){
- hideQualityMonitoringTousseMsg();
- }else{
- showQualityMonitoringTousseMsg();
+ if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
+ if('无' == result.data.scope){
+ hideQualityMonitoringTousseMsg();
+ }else{
+ showQualityMonitoringTousseMsg();
+ }
}
+
// 如果显示炉次炉号,添加表单
if(result.data.showSterilizerNumFrequency == '是'){
items.push(createQualityMonitoringElementSterNameQW(''));
@@ -964,18 +967,20 @@
top.Ext.getCmp('tousseName2').setValue(result.data.tousseName);
}
top.Ext.getCmp('barcode2').setValue(result.data.barcode);
- top.Ext.getCmp('scope').setValue(result.data.scope);
+ top.Ext.getCmp('scope2').setValue(result.data.scope);
top.Ext.getCmp('responsiblePerson2').setValue(result.data.responsiblePerson);
top.Ext.getCmp('registerPerson2').setValue(result.data.createUserName);
top.Ext.getCmp('tousseInstanceId2').setValue(result.data.tousseDefinitionId);
top.Ext.getCmp('remark2').setValue(result.data.remark);
top.Ext.getCmp('optionAmount2').setValue('');
-
- if('无' == result.data.scope){
- hideQualityMonitoringTousseMsg();
- }else{
- showQualityMonitoringTousseMsg();
+ if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
+ if('无' == result.data.scope){
+ hideQualityMonitoringTousseMsg();
+ }else{
+ showQualityMonitoringTousseMsg();
+ }
}
+
// 如果显示炉次炉号,添加表单
if(result.showSterNameAndFre == '是'){
items.push(createQualityMonitoringElementSterNameQW(result.data.sterilizerName));
@@ -1113,8 +1118,10 @@
top.Ext.getCmp('repacking').setVisible(true);
top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
}
- if(result.data.scope == "无"){
- hideTousseAndMaterialMsg();
+ if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
+ if(result.data.scope == "无"){
+ hideTousseAndMaterialMsg();
+ }
}
for(var i = 0 ; i< result.data.items.length ; i++){
var item = result.data.items[i];
@@ -1667,8 +1674,10 @@
top.Ext.getCmp('repacking').setVisible(true);
top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
}
- if(result.data.scope == "无"){
- hideTousseAndMaterialMsg();
+ if(sstsConfig.hasOwnProperty('isInspectScopeHideTousseMsg') && sstsConfig.isInspectScopeHideTousseMsg){
+ if(result.data.scope == "无"){
+ hideTousseAndMaterialMsg();
+ }
}
top.Ext.getCmp('addRoutineMonitoringForm').remove('itemsFieldSet');