Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r41154 -r41383 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 41154) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 41383) @@ -2549,6 +2549,11 @@ */ var SSTS_Expiration = SSTS_Expiration_Create && SSTS_Expiration_Update && SSTS_Expiration_Delete && SSTS_Expiration_Select; +var SSTS_HolidayConfig = true; + +SSTS_HolidayConfig = false; + + /** * 《DGSETYY-122:申请科室关联病区查询》权限 */ @@ -2880,7 +2885,7 @@ && SSTS_SterilerGroup_manager && SSTS_SterilizationPurpose_manager && SSTS_SterilizationMode_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_Bioreader && SSTS_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping +&& SSTS_Sterilizer && SSTS_Bioreader && SSTS_Expiration && SSTS_HolidayConfig && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping && SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig && SSTS_Tousse && SSTS_Damage && SSTS_TousseGroup && SSTS_UrgentLevel_manager && SSTS_OperationRoom_manager && SSTS_equipment_manager && SSTS_DiposableGoodsSummary_manager && SSTS_ChineseMedicineApparatus_manager && SSTS_DeviceMaintenanceCusGroup_manager; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r41361 -r41383 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 41361) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 41383) @@ -1152,7 +1152,7 @@ {hidden :SSTS_Bioreader,text:"生物阅读器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/bioreader/bioreaderView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :(!sstsConfig.hasOwnProperty('disableDeviceInterface')) || sstsConfig.disableDeviceInterface,text:"设备接口管理",href:WWWROOT+'/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Expiration,text:"物品失效期管理",href:WWWROOT+'/disinfectsystem/basedatamanager/expirationDateInfo/expirationDateInfoView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :false,text:"假期及调休配置",href:WWWROOT+'/disinfectsystem/basedatamanager/holiday/holidayListView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_HolidayConfig,text:"假期及调休配置",href:WWWROOT+'/disinfectsystem/basedatamanager/holiday/holidayListView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"PDA参数设置",href:WWWROOT+'/personalSetting/modifyExitLoginTime.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TechnicalDifficulty_manager,text:"技术难度管理",href:WWWROOT+'/disinfectsystem/basedatamanager/technicalDifficulty/technicalDifficultyView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SupplyRoomType_manager,text:"仓库管理",href:WWWROOT+'/disinfectsystem/basedatamanager/warehouse/wareHouseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.js =================================================================== diff -u -r41361 -r41383 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.js (.../holidayListView.js) (revision 41361) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.js (.../holidayListView.js) (revision 41383) @@ -93,13 +93,15 @@ items: [{ xtype: 'button', text: '添加', + hidden: SSTS_HolidayConfig_Create, iconCls: 'icon-add', handler: function() { showHolidayForm(); } }, { xtype: 'button', text: '修改', + hidden: SSTS_HolidayConfig_Update, iconCls: 'icon-edit', handler: function() { var selection = appGird.getSelectionModel().getSelection(); @@ -112,6 +114,7 @@ }, { xtype: 'button', text: '删除', + hidden: SSTS_HolidayConfig_Delete, iconCls: 'icon-remove', handler: function() { var selection = appGird.getSelectionModel().getSelection(); Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r41154 -r41383 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 41154) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 41383) @@ -734,6 +734,11 @@ + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.jsp =================================================================== diff -u -r41361 -r41383 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.jsp (.../holidayListView.jsp) (revision 41361) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/holiday/holidayListView.jsp (.../holidayListView.jsp) (revision 41383) @@ -17,4 +17,25 @@ + \ No newline at end of file