Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r14698 -r14967
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 14698)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 14967)
@@ -951,6 +951,11 @@
SSTS_ImportBaseData = false;
+var SSTS_UserIPAndOrgUnitMapping = true;
+
+SSTS_UserIPAndOrgUnitMapping = false;
+
+
var SSTS_Tousse_Update = true;
SSTS_Tousse_Update = false;
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r14951 -r14967
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14951)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 14967)
@@ -533,7 +533,7 @@
{hidden :SSTS_QualityItem,text:"质量监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=质量监测',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Qualitymonitoring,text:"定期监测项设置",href:WWWROOT+'/disinfectsystem/basedatamanager/qualitymonitoringConfig/qualitymonitoringConfigView.jsp?type=定期监测',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_ImportBaseData,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_ImportBaseData,text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true} //用户当前科室的配置
+ {hidden :!(SSTS_UserIPAndOrgUnitMapping || sstsConfig.enableUserIPAndOrgUnitMapping),text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/userIPAndOrgUnitMapping/userIPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true} //用户当前科室的配置
// {hidden :false,text:"打印表单模板设置",href:WWWROOT+'/disinfectsystem/print/printForm.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js
===================================================================
diff -u -r14888 -r14967
--- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js (.../config.js) (revision 14888)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/config.js (.../config.js) (revision 14967)
@@ -66,5 +66,7 @@
//默认弹出切换科室选项
defaultShowOrgChange:true,
//查询明细核算月报,核算月报,自定义器械包显示包数量
- isMonthReportShowCustonTousseAmount : true
+ isMonthReportShowCustonTousseAmount : true,
+ //是否启用:IP对应的默认科室配置的菜单
+ enableUserIPAndOrgUnitMapping : true
}
\ No newline at end of file
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r14551 -r14967
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 14551)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 14967)
@@ -457,9 +457,11 @@
+
+