Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r23276 -r23429 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 23276) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 23429) @@ -262,7 +262,7 @@ - + Index: ssts-web/src/main/resources/systemset/portalPage.xml =================================================================== diff -u -r23230 -r23429 --- ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 23230) +++ ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 23429) @@ -28,7 +28,7 @@ - + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r23208 -r23429 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 23208) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 23429) @@ -1170,7 +1170,7 @@ * 《高值耗材管理》菜单 */ var SSTS_ExpensiveGoods_Hidden_Menu = true; - + if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) { SSTS_ExpensiveGoods_Hidden_Menu = false; } @@ -1251,10 +1251,10 @@ //高值耗材结算管理 -var SSTS_ExpensiveGoodsStockTake_Manager = true; - +//var SSTS_ExpensiveGoodsStockTake_Manager = true; + //高值耗材盘盈盘亏管理 var SSTS_ExpensiveGoodsStockTakeInOrOut_Manager = true; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r23409 -r23429 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 23409) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 23429) @@ -348,7 +348,7 @@ //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.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_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_ExpensiveGoodsWorkFlowApprovalTask_Hidden_Manager,text:"我的待办任务",href:encodeURI(WWWROOT+'/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单'),hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js =================================================================== diff -u -r23160 -r23429 --- ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js (.../menuconfigure.js) (revision 23160) +++ ssts-web/src/main/webapp/expensivegoodshomepage/menuconfigure.js (.../menuconfigure.js) (revision 23429) @@ -27,7 +27,7 @@ //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材调拨单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/appropriationView.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_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/webapp/expensivegoodshomepage/menu.jsp =================================================================== diff -u -r23160 -r23429 --- ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp (.../menu.jsp) (revision 23160) +++ ssts-web/src/main/webapp/expensivegoodshomepage/menu.jsp (.../menu.jsp) (revision 23429) @@ -1154,7 +1154,7 @@ * 《高值耗材管理》菜单 */ var SSTS_ExpensiveGoods_Hidden_Menu = true; - + if (!notInWhiteList(sstsConfig, 'expensiveGoodsManage') && sstsConfig.enableExpensiveGoods) { SSTS_ExpensiveGoods_Hidden_Menu = false; } @@ -1235,10 +1235,10 @@ //高值耗材结算管理 -var SSTS_ExpensiveGoodsStockTake_Manager = true; - +//var SSTS_ExpensiveGoodsStockTake_Manager = true; + //高值耗材盘盈盘亏管理 var SSTS_ExpensiveGoodsStockTakeInOrOut_Manager = true;