Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r17138 -r17150
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17138)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17150)
@@ -102,27 +102,41 @@
SSTS_MATERIAL_DAMAGE_TOTAL_VIEW = false;
+/**
+ * 《打印回收单设置添加》权限
+ */
var SSTS_PrintConfig_Create = true;
-SSTS_PrintConfig_Create = false;
+ SSTS_PrintConfig_Create = false;
+/**
+ * 《打印回收单设置修改》权限
+ */
var SSTS_PrintConfig_Update = true;
-SSTS_PrintConfig_Update = false;
+ SSTS_PrintConfig_Update = false;
+/**
+ * 《打印回收单设置查询》权限
+ */
var SSTS_PrintConfig_Select = true;
-SSTS_PrintConfig_Select = false;
+ SSTS_PrintConfig_Select = false;
+/**
+ * 《打印回收单设置删除》权限
+ */
var SSTS_PrintConfig_Delete = true;
-SSTS_PrintConfig_Delete = false;
+ SSTS_PrintConfig_Delete = false;
-
+/**
+ * 《打印发货计划设置》、《打印发货单设置》、《回收科室分组设置》、《物品科室共用配置》菜单
+ */
var SSTS_RecyclePrint_Menu = SSTS_PrintConfig_Create || SSTS_PrintConfig_Update || SSTS_PrintConfig_Select || SSTS_PrintConfig_Delete;
var SSTS_WorkLoad_Menu = true;
@@ -607,12 +621,6 @@
SSTS_RecallRecord_Select = false;
-
-var SSTS_ForeignTousseDefinition_Menu = true;
-
-SSTS_ForeignTousseDefinition_Menu = false;
-
-
var SSTS_SatisfactionSurveyTemplate_Menu = true;
SSTS_SatisfactionSurveyTemplate_Menu = false;
@@ -706,298 +714,458 @@
SSTS_WarehouseEntryOut_Menu = false;
-var SSTS_departMentApplication_Serch = true;
-
-SSTS_departMentApplication_Serch = false;
+/**
+ * 《科室申领模版》菜单
+ */
+var SSTS_departMentApplication = true;
+
+ SSTS_departMentApplication = false;
-
-var SSTS_printApplication_Serch = true;
-
-SSTS_printApplication_Serch = false;
+/**
+ * 《特殊感染类型配置管理》权限
+ */
+var SSTS_SpecialInfection_manager = true;
+
+ SSTS_SpecialInfection_manager = false;
-
-
-var SSTS_SpecialInfection_Serch = true;
-
-SSTS_SpecialInfection_Serch = false;
+/**
+ * 《申请单终止原因配置管理》权限
+ */
+var SSTS_application_end_cause_manager = true;
+
+ SSTS_application_end_cause_manager = false;
-
-
-var SSTS_application_end_cause_Serch = true;
-
-SSTS_application_end_cause_Serch = false;
+/**
+ * 《外部代理灭菌分组设置管理》权限
+ */
+var SSTS_foreignProxyGroup_manager = true;
+
+ SSTS_foreignProxyGroup_manager = false;
-var SSTS_foreignProxyGroup_Serch = true;
-
-SSTS_foreignProxyGroup_Serch = false;
-
-var SSTS_foreignTousseProcessType = true;
-
-SSTS_foreignTousseProcessType = false;
+/**
+ * 《外来器械处理方式管理》权限
+ */
+var SSTS_foreignTousseProcessType_manager = true;
+
+ SSTS_foreignTousseProcessType_manager = false;
-
if (sstsConfig.disableForeignTousse){
- SSTS_foreignTousseProcessType = true;
+ SSTS_foreignTousseProcessType_manager = true;
}
-var SSTS_SterilerGroup_Serch = true;
-
-SSTS_SterilerGroup_Serch = false;
+/**
+ * 《灭菌炉分组设置管理》权限
+ */
+var SSTS_SterilerGroup_manager = true;
+
+ SSTS_SterilerGroup_manager = false;
-var SSTS_SterilizationPurpose = false;//灭菌目的菜单权限控制(略),false表示有权限
+/**
+ * 《灭菌目的设置管理》权限
+ */
+var SSTS_SterilizationPurpose_manager = true;
+
+ SSTS_SterilizationPurpose_manager = false;
+
+/**
+ * 《材料类型添加》权限
+ */
var SSTS_Material_Create = true;
-SSTS_Material_Create = false;
+ SSTS_Material_Create = false;
+/**
+ * 《材料类型修改》权限
+ */
var SSTS_Material_Update = true;
-
+
SSTS_Material_Update = false;
+/**
+ * 《材料类型查询》权限
+ */
var SSTS_Material_Select = true;
-
+
SSTS_Material_Select = false;
+/**
+ * 《材料类型删除》权限
+ */
var SSTS_Material_Delete = true;
-SSTS_Material_Delete = false;
+ SSTS_Material_Delete = false;
+/**
+ * 《材料类型设置 》、《材料清洗分类设置》菜单
+ */
var SSTS_Material = SSTS_Material_Create && SSTS_Material_Update && SSTS_Material_Select && SSTS_Material_Delete ;
+
+/**
+ * 《容器添加》权限
+ */
var SSTS_Container_Create = true;
-SSTS_Container_Create = false;
+ SSTS_Container_Create = false;
+/**
+ * 《容器修改》权限
+ */
var SSTS_Container_Update = true;
-SSTS_Container_Update = false;
+ SSTS_Container_Update = false;
+/**
+ * 《容器查询》权限
+ */
var SSTS_Container_Select = true;
-SSTS_Container_Select = false;
+ SSTS_Container_Select = false;
+/**
+ * 《容器删除》权限
+ */
var SSTS_Container_Delete = true;
-SSTS_Container_Delete = false;
+ SSTS_Container_Delete = false;
+/**
+ * 《容器修改》菜单
+ */
var SSTS_Container = SSTS_Container_Create && SSTS_Container_Update && SSTS_Container_Select && SSTS_Container_Delete;
-var SSTS_Operation = true;
+/**
+ * 《手术名称管理》权限
+ */
+var SSTS_Operation_manager = true;
-SSTS_Operation = false;
+ SSTS_Operation_manager = false;
-
-var SSTS_ProjectName = true;
-
-SSTS_ProjectName = false;
+/**
+ * 《设备维护项目名称配置管理软件》权限
+ */
+var SSTS_ProjectName_manager = true;
+
+SSTS_ProjectName_manager = false;
-var SSTS_PackType = true;
+/**
+ * 《包装类型配置管理》权限
+ */
+var SSTS_PackType_manager = true;
-SSTS_PackType = false;
+ SSTS_PackType_manager = false;
-var SSTS_DiposableGoodsType = true;
+/**
+ * 《一次性物品类型配置管理》权限
+ */
+var SSTS_DiposableGoodsType_manager = true;
-SSTS_DiposableGoodsType = false;
+ SSTS_DiposableGoodsType_manager = false;
-
if (sstsConfig.disableDisposableGoods){
- SSTS_DiposableGoodsType = true;
+ SSTS_DiposableGoodsType_manager = true;
}
+
+/**
+ * 《任务组添加》权限
+ */
var SSTS_TaskGroup_Create = true;
-SSTS_TaskGroup_Create = false;
+ SSTS_TaskGroup_Create = false;
+/**
+ * 《任务组修改》权限
+ */
var SSTS_TaskGroup_Update = true;
-SSTS_TaskGroup_Update = false;
+ SSTS_TaskGroup_Update = false;
+/**
+ * 《任务组查询》权限
+ */
var SSTS_TaskGroup_Select = true;
-SSTS_TaskGroup_Select = false;
+ SSTS_TaskGroup_Select = false;
+/**
+ * 《任务组删除》权限
+ */
var SSTS_TaskGroup_Delete = true;
-SSTS_TaskGroup_Delete = false;
+ SSTS_TaskGroup_Delete = false;
+/**
+ * 《任务组设置》、《丢失报损类型设置》、《器械包分组设置》菜单
+ */
var SSTS_TaskGroup =SSTS_TaskGroup_Create && SSTS_TaskGroup_Update && SSTS_TaskGroup_Select &&SSTS_TaskGroup_Delete;
+/**
+ * 《供应商包添加》权限
+ */
var SSTS_Supplier_Create = true;
-
+
SSTS_Supplier_Create = false;
+/**
+ * 《供应商包修改》权限
+ */
var SSTS_Supplier_Update = true;
-SSTS_Supplier_Update = false;
+ SSTS_Supplier_Update = false;
+/**
+ * 《供应商包查询》权限
+ */
var SSTS_Supplier_Select = true;
-SSTS_Supplier_Select = false;
+ SSTS_Supplier_Select = false;
+/**
+ * 《供应商包删除》权限
+ */
var SSTS_Supplier_Delete = true;
SSTS_Supplier_Delete = false;
+/**
+ * 《供应商管理》菜单
+ */
var SSTS_Supplier =SSTS_Supplier_Create && SSTS_Supplier_Update && SSTS_Supplier_Select &&SSTS_Supplier_Delete;
+
+/**
+ * 《清洗程序添加》权限
+ */
var SSTS_CleanMethod_Create = true;
-SSTS_CleanMethod_Create = false;
+ SSTS_CleanMethod_Create = false;
+/**
+ * 《清洗程序修改》权限
+ */
var SSTS_CleanMethod_Update = true;
-SSTS_CleanMethod_Update = false;
+ SSTS_CleanMethod_Update = false;
+/**
+ * 《清洗程序查询》权限
+ */
var SSTS_CleanMethod_Select = true;
-SSTS_CleanMethod_Select = false;
+ SSTS_CleanMethod_Select = false;
+/**
+ * 《清洗程序删除》权限
+ */
var SSTS_CleanMethod_Delete = true;
-SSTS_CleanMethod_Delete = false;
+ SSTS_CleanMethod_Delete = false;
+/**
+ * 《清洗程序删除》权限
+ */
var SSTS_CleanMethod =SSTS_CleanMethod_Create && SSTS_CleanMethod_Update && SSTS_CleanMethod_Select &&SSTS_CleanMethod_Delete;
+
+/**
+ * 《清洗机添加》权限
+ */
var SSTS_Rinser_Create = true;
-SSTS_Rinser_Create = false;
+ SSTS_Rinser_Create = false;
+/**
+ * 《清洗机修改》权限
+ */
var SSTS_Rinser_Update = true;
-SSTS_Rinser_Update = false;
+ SSTS_Rinser_Update = false;
+/**
+ * 《清洗机查询》权限
+ */
var SSTS_Rinser_Select = true;
-SSTS_Rinser_Select = false;
+ SSTS_Rinser_Select = false;
+/**
+ * 《清洗机删除》权限
+ */
var SSTS_Rinser_Delete = true;
-SSTS_Rinser_Delete = false;
+ SSTS_Rinser_Delete = false;
+/**
+ * 《清洗机管理》菜单
+ */
var SSTS_Rinser =SSTS_Rinser_Create && SSTS_Rinser_Update && SSTS_Rinser_Select &&SSTS_Rinser_Delete;
+
+/**
+ * 《灭菌程序添加》权限
+ */
var SSTS_Sterilisation_Create = true;
-SSTS_Sterilisation_Create = false;
+ SSTS_Sterilisation_Create = false;
+/**
+ * 《灭菌程序修改》权限
+ */
var SSTS_Sterilisation_Update = true;
-SSTS_Sterilisation_Update = false;
+ SSTS_Sterilisation_Update = false;
+/**
+ * 《灭菌程序查询》权限
+ */
var SSTS_Sterilisation_Select = true;
-SSTS_Sterilisation_Select = false;
+ SSTS_Sterilisation_Select = false;
+/**
+ * 《灭菌程序删除》权限
+ */
var SSTS_Sterilisation_Delete = true;
-SSTS_Sterilisation_Delete = false;
+ SSTS_Sterilisation_Delete = false;
+/**
+ * 《灭菌程序管理》菜单
+ */
var SSTS_Sterilisation =SSTS_Sterilisation_Create && SSTS_Sterilisation_Update && SSTS_Sterilisation_Select &&SSTS_Sterilisation_Delete;
+
+/**
+ * 《灭菌炉添加》权限
+ */
var SSTS_Sterilizer_Create = true;
-SSTS_Sterilizer_Create = false;
+ SSTS_Sterilizer_Create = false;
+/**
+ * 《灭菌炉修改》权限
+ */
var SSTS_Sterilizer_Update = true;
-SSTS_Sterilizer_Update = false;
+ SSTS_Sterilizer_Update = false;
+/**
+ * 《灭菌炉删除》权限
+ */
var SSTS_Sterilizer_Select = true;
-SSTS_Sterilizer_Select = false;
+ SSTS_Sterilizer_Select = false;
+/**
+ * 《灭菌炉删除》权限
+ */
var SSTS_Sterilizer_Delete = true;
-SSTS_Sterilizer_Delete = false;
+ SSTS_Sterilizer_Delete = false;
+/**
+ * 《灭菌炉管理》菜单
+ */
var SSTS_Sterilizer =SSTS_Sterilizer_Create && SSTS_Sterilizer_Update && SSTS_Sterilizer_Select &&SSTS_Sterilizer_Delete;
+
+/**
+ * 《失效期添加》权限
+ */
var SSTS_Expiration_Create = true;
-SSTS_Expiration_Create = false;
+ SSTS_Expiration_Create = false;
+
+/**
+ * 《失效期修改》权限
+ */
var SSTS_Expiration_Update = true;
-SSTS_Expiration_Update = false;
+ SSTS_Expiration_Update = false;
+
+/**
+ * 《失效期删除》权限
+ */
var SSTS_Expiration_Delete = true;
-SSTS_Expiration_Delete = false;
+ SSTS_Expiration_Delete = false;
+
+/**
+ * 《失效期查询》权限
+ */
var SSTS_Expiration_Select = true;
-SSTS_Expiration_Select = false;
+ SSTS_Expiration_Select = false;
+/**
+ * 《物品失效期管理》菜单
+ */
var SSTS_Expiration = SSTS_Expiration_Create && SSTS_Expiration_Update && SSTS_Expiration_Delete && SSTS_Expiration_Select;
-var SSTS_SupplyRoomType = true;
-
-SSTS_SupplyRoomType = false;
+
+/**
+ * 《科室供应室配置管理》权限
+ */
+var SSTS_SupplyRoomType_manager = true;
+
+SSTS_SupplyRoomType_manager = false;
-var SSTS_SerialNumber = true;
+/**
+ * 《流水号配置管理》权限
+ */
+var SSTS_SerialNumber_manager = true;
-SSTS_SerialNumber = false;
+ SSTS_SerialNumber_manager = false;
-var SSTS_QualityItem_Create = true;
-
-SSTS_QualityItem_Create = false;
-
-var SSTS_QualityItem_Update = true;
-
-SSTS_QualityItem_Update = false;
-
-var SSTS_QualityItem_Select = true;
-
-SSTS_QualityItem_Select = false;
-
-var SSTS_QualityItem_Delete = true;
-
-SSTS_QualityItem_Delete = false;
-
var SSTS_routineMonitoring_Config = true;
@@ -1009,54 +1177,79 @@
SSTS_QualityMonitoring_Config = false;
-var SSTS_QualityItem = SSTS_QualityItem_Create && SSTS_QualityItem_Update && SSTS_QualityItem_Select && SSTS_QualityItem_Delete;
var SSTS_routineMonitoring_manager = true;
SSTS_routineMonitoring_manager = false;
-var SSTS_ImportBaseData = true;
+/**
+ * 《导入基础数据管理》权限
+ */
+var SSTS_ImportBaseData_manager = true;
-SSTS_ImportBaseData = false;
+ SSTS_ImportBaseData_manager = false;
+/**
+ * 《IP对应的默认科室配置》菜单
+ */
var SSTS_IPAndOrgUnitMapping = true;
-
-SSTS_IPAndOrgUnitMapping = false;
+
+ SSTS_IPAndOrgUnitMapping = false;
+if (!sstsConfig.enableIPAndOrgUnitMapping) {
+ SSTS_IPAndOrgUnitMapping = true;
+}
+
+/**
+ * 《器械包修改》权限
+ */
var SSTS_Tousse_Update = true;
-
+
SSTS_Tousse_Update = false;
+/**
+ * 《物品绑定》菜单
+ */
var SSTS_GoodsBindingConfig = true;
-
-SSTS_GoodsBindingConfig = false;
+
+ SSTS_GoodsBindingConfig = false;
-var SSTS_ShiftConfig = true;
+/**
+ * 《班次类型配置》权限
+ */
+var SSTS_ShiftConfig_manager = true;
-SSTS_ShiftConfig = false;
+ SSTS_ShiftConfig_manager = false;
-var SSTS_GoodFilter = true;
-
-SSTS_GoodFilter = false;
+/**
+ * 《物品黑白名单过滤设置》菜单
+ */
+var SSTS_GoodsFilterConfig = true;
+
+ SSTS_GoodsFilterConfig = false;
var SSTS_ComboTousseManager = true;
SSTS_ComboTousseManager = false;
-
-//参数设置的权限,要根据新的权限扩展,新加了菜单权限,变量对应加上来
-var SSTS_BaseData_Manager = SSTS_ImportBaseData&&SSTS_QualityItem &&SSTS_SerialNumber && SSTS_SupplyRoomType&&SSTS_Expiration && SSTS_Sterilizer
-&& SSTS_Sterilisation &&SSTS_Rinser && SSTS_CleanMethod&&SSTS_Supplier &&SSTS_TaskGroup && SSTS_DiposableGoodsType && SSTS_PackType
-&& SSTS_ProjectName && SSTS_Operation && SSTS_Container &&SSTS_Material && SSTS_departMentApplication_Serch;
-
-
+/**
+ * 《参数设置》菜单,注意:后续新增的功能只要是“参数设置”菜单的子菜单,需要把此子菜单的权限变量加上
+ */
+var SSTS_BaseData_Manager = SSTS_departMentApplication && SSTS_ShiftConfig_manager
+&& SSTS_RecyclePrint_Menu && SSTS_SupplyRoomType_manager && SSTS_SpecialInfection_manager
+&& SSTS_application_end_cause_manager && SSTS_foreignProxyGroup_manager && SSTS_foreignTousseProcessType_manager
+&& SSTS_SterilerGroup_manager && SSTS_SterilizationPurpose_manager && SSTS_Material && SSTS_TaskGroup
+&& SSTS_Operation_manager && SSTS_ProjectName_manager && SSTS_PackType_manager && SSTS_Tousse_Update
+&& SSTS_DiposableGoodsType_manager && SSTS_Container && SSTS_Supplier && SSTS_CleanMethod && SSTS_Rinser && SSTS_Sterilisation
+&& SSTS_Sterilizer && SSTS_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping
+&& SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig;