Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java
===================================================================
diff -u -r24065 -r24209
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java (.../HttpOptionManagerSSTSImpl.java) (revision 24065)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/systemsetting/service/HttpOptionManagerSSTSImpl.java (.../HttpOptionManagerSSTSImpl.java) (revision 24209)
@@ -310,6 +310,10 @@
return "设备";
}else if(optionId.equals(HttpOption.SYSTEMSETTING_WASHMETHOD)){
return "清洗方法";
+ }else if(optionId.equals(HttpOption.SYSTEMSETTING_RESPONSIBILITYPART)){
+ return "责任环节分组";
+ }else if(optionId.equals(HttpOption.SYSTEMSETTING_DEFECTIVEMESSAGEREGISTER_TYPE)){
+ return "缺陷信息登记类型";
}
return "常用参数";
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r24142 -r24209
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 24142)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 24209)
@@ -598,6 +598,9 @@
+
+
+
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r24142 -r24209
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 24142)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 24209)
@@ -1499,6 +1499,22 @@
/**
+ * 《责任环节设置管理》权限
+ */
+var SSTS_ResponsibilityPart_manager = true;
+
+SSTS_ResponsibilityPart_manager = false;
+
+
+/**
+ * 《缺陷信息登记类型设置》权限
+ */
+var SSTS_DefectiveMessageRegisterType_manager = true;
+
+SSTS_DefectiveMessageRegisterType_manager = false;
+
+
+/**
* 《材料管理》、《材料类型设置 》、《材料清洗分类设置》菜单
*/
var SSTS_Material = true;
Index: forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java
===================================================================
diff -u -r24142 -r24209
--- forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 24142)
+++ forgon-core/src/main/java/com/forgon/systemsetting/model/HttpOption.java (.../HttpOption.java) (revision 24209)
@@ -116,6 +116,14 @@
*/
public final static String SYSTEMSETTING_STERILIZATIONMODE = "sterilizationMode";
/**
+ * 责任环节
+ */
+ public final static String SYSTEMSETTING_RESPONSIBILITYPART = "responsibilityPart";
+ /**
+ * 缺陷信息登记类型
+ */
+ public final static String SYSTEMSETTING_DEFECTIVEMESSAGEREGISTER_TYPE = "defectiveMessageRegisterType";
+ /**
* 一次性物品类型
*/
public final static String SYSTEMSETTING_DIPOSABLEGOODS_TYPE = "diposableGoodsType";
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r24202 -r24209
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 24202)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 24209)
@@ -730,7 +730,8 @@
{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFloAuthorization_Hidden_Manager,text:"流程审批权限代理配置",href:WWWROOT+'/systemmanage/workFlow/workFlowAuthorize/workFlowApprovalAuthorization.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_UsedDoctor_manager,text:"常用医生设置",href:WWWROOT+'/disinfectsystem/basedatamanager/commonlyUsedDoctor/comUsedDoctorView.jsp',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_Handover_manager,text:"交接模块管理",href:WWWROOT+'/disinfectsystem/basedatamanager/handover/handoverView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :SSTS_Handover_manager,text:"责任环节",href:WWWROOT+'/disinfectsystem/basedatamanager/responsibilityPart/responsibilityPartView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}