Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r20764 -r20817
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 20764)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 20817)
@@ -211,6 +211,13 @@
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r20807 -r20817
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 20807)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 20817)
@@ -318,19 +318,19 @@
},{
text:"高值耗材管理",
singleClickExpand:singleClickExpandTree,
- hidden:!sstsConfig.enableExpensiveGoods,
+ hidden:SSTS_ExpensiveGoods_Menu,
children:[
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材库存",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材出入库记录",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/storageRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true},
//{hidden :SSTS_DisposableGoodsProfitAndLoss_Manager,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true},
//{hidden :SSTS_DisposableGoodsCheck_Manager,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/'+ (sstsConfig.inventoryDisposableVersion == 2 ? "inventoryrecordView2.jsp" : "inventoryrecordView.jsp") +'?type=expensiveGoods',hrefTarget:linkTarget,leaf:true},
- {hidden :!sstsConfig.enableExpensiveGoods,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_ExpensiveGoods_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"采购计划",
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r20735 -r20817
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 20735)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 20817)
@@ -1076,7 +1076,17 @@
SSTS_WarehouseEntryOut_Menu = false;
-////////////
+/* 高值耗材 */
+/**
+ * 《高值耗材管理》菜单
+ */
+var SSTS_ExpensiveGoods_Menu = true;
+
+ if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) {
+ SSTS_ExpensiveGoods_Menu = false;
+ }
+
+/* 高值耗材 */
/**
* 《一次性物品管理》菜单
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r20381 -r20817
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 20381)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 20817)
@@ -35,6 +35,8 @@
hideApplyDepartColumn : true, // 隐藏申请科室
hideSettleDepartColumn : false, // 隐藏结算科室
companyName : "dingxiang",
+ // 是否启用高值耗材功能,默认为否
+ enableExpensiveGoods: true,
//回收一键入筐
recycleAllTousseIntoBasket : true
}
\ No newline at end of file