Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r22386 -r22405 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 22386) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 22405) @@ -1124,7 +1124,7 @@ * 《高值耗材管理》菜单 */ var SSTS_ExpensiveGoods_Hidden_Menu = true; - + if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) { SSTS_ExpensiveGoods_Hidden_Menu = false; } @@ -1190,6 +1190,25 @@ SSTS_ExpensiveGoodsSupplier_Hidden_Menu = false; +//高值耗材盘点记录管理 +var SSTS_ExpensiveGoodsInventoryRecord_Manager = true; + +SSTS_ExpensiveGoodsInventoryRecord_Manager = false; + + +//高值耗材结算管理 +var SSTS_ExpensiveGoodsStockTake_Manager = true; + +SSTS_ExpensiveGoodsStockTake_Manager = false; + + +//高值耗材盘盈盘亏管理 +var SSTS_ExpensiveGoodsStockTakeInOrOut_Manager = true; + +SSTS_ExpensiveGoodsStockTakeInOrOut_Manager = false; + + + //高值耗材我的已办管理 var SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Hidden_Manager = true; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r22386 -r22405 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22386) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22405) @@ -341,9 +341,9 @@ {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsPrepareGodownEntry_Hidden_Manager,text:"高值耗材预入库单管理",href:encodeURI(WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=' + entryTypePrepareIn),hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ExpensiveGoodsGodownOutEntryManagement_Hidden_Menu,text:"高值耗材退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownOutEntryView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp'+'?type=' + inventoryTypeCodeExpensiveGoods,hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ExpensiveGoodsStockTakeInOrOut_Manager,text:"高值耗材盘盈盘亏管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownStockTakeView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ExpensiveGoodsInventoryRecord_Manager,text:"高值耗材盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp'+'?type=' + inventoryTypeCodeExpensiveGoods,hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ExpensiveGoodsStockTake_Manager,text:"高值耗材结算管理",href:WWWROOT+'/disinfectsystem/reportforms/stocktakeView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ExpensiveGoodsBill_Hidden_Menu,text:"高值耗材发票管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ExpensiveGoodsAuthorization_Hidden_Menu,text:"高值耗材授权管理",href:WWWROOT+'/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:encodeURI(WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单'),hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r22386 -r22405 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 22386) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 22405) @@ -255,6 +255,12 @@ + + + + + +