Fisheye: Tag 17177 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionView.js'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r17150 -r17177 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17150) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 17177) @@ -807,7 +807,7 @@ /** - * 《材料类型设置 》、《材料清洗分类设置》菜单 + * 《材料管理》、《材料类型设置 》、《材料清洗分类设置》菜单 */ var SSTS_Material = SSTS_Material_Create && SSTS_Material_Update && SSTS_Material_Select && SSTS_Material_Delete ; @@ -918,11 +918,35 @@ /** - * 《任务组设置》、《丢失报损类型设置》、《器械包分组设置》菜单 + * 《任务组设置》菜单 */ var SSTS_TaskGroup =SSTS_TaskGroup_Create && SSTS_TaskGroup_Update && SSTS_TaskGroup_Select &&SSTS_TaskGroup_Delete; /** + * 《丢失报损类型设置》菜单 + */ +var SSTS_Damage = true; + + SSTS_Damage = false; + + +/** + * 《《器械包分组设置》》菜单 + */ +var SSTS_TousseGroup = true; + + SSTS_TousseGroup = false; + + +/** + * 《导入基础数据管理》权限 + */ +var SSTS_ImportBaseData_manager = true; + + SSTS_ImportBaseData_manager = false; + + +/** * 《供应商包添加》权限 */ var SSTS_Supplier_Create = true; @@ -1235,6 +1259,14 @@ SSTS_GoodsFilterConfig = false; +/** + * 《器械包定义管理》、《停用的器械包》、《外来器械包管理》、《器械包库存》菜单 + */ +var SSTS_Tousse = true; + + SSTS_Tousse = false; + + var SSTS_ComboTousseManager = true; SSTS_ComboTousseManager = false; @@ -1249,7 +1281,7 @@ && 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_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping -&& SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig; +&& SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig && SSTS_Tousse && SSTS_Damage && SSTS_TousseGroup; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.js =================================================================== diff -u -r17150 -r17177 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.js (.../damageErrorMaterialTypeView.js) (revision 17150) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.js (.../damageErrorMaterialTypeView.js) (revision 17177) @@ -110,22 +110,22 @@ var sign = true; var tbar = [ { text : '添加', - hidden : SSTS_TaskGroup_Create, + hidden : SSTS_Damage_Create, iconCls : 'btn_ext_application_add', handler : function() { addAndEditDamageErrorMaerialType(0); } }, '-', { text : '修改', - hidden : SSTS_TaskGroup_Update, + hidden : SSTS_Damage_Update, iconCls : 'btn_ext_application_edit', id : 'editTbar', handler : function() { loadFormData(grid); } }, '-', { text : '删除', - hidden : SSTS_TaskGroup_Delete, + hidden : SSTS_Damage_Delete, iconCls : 'btn_ext_application_del', handler : function() { deleteDamageErrorMaerialType(grid); Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r17150 -r17177 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17150) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 17177) @@ -317,7 +317,7 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_Warehouse_Menu, children:[ - {hidden :SSTS_DiposableGoodsNode_Menu,text:"材料管理",href:WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Material,text:"材料管理",href:WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_godownEntryNode_Menu,text:"材料入库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialEntryView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WarehouseEntryOut_Menu,text:"材料退库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialOutView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_stockTakeInfoNode_Menu,text:"材料盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type=material',hrefTarget:linkTarget,leaf:true} @@ -339,11 +339,11 @@ singleClickExpand:singleClickExpandTree, hidden:SSTS_TousseManagerView, children:[ - {hidden :SSTS_TousseDefinitionManager_View,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseDefinitionManager_View,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_ForeignTousse_Recyc_Menu,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Tousse,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Tousse,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Tousse,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :(!sstsConfig.hasOwnProperty('disabeleTousseMaintain')) || sstsConfig.disabeleTousseMaintain,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true} ] @@ -567,8 +567,8 @@ {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TaskGroup,text:"任务组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/taskGroup/taskGroupView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TaskGroup,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TaskGroup,text:"器械包分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Damage,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseGroup,text:"器械包分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Operation_manager,text:"手术名称设置",href:WWWROOT+'/systemmanage/operationNameView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=projectName',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.js =================================================================== diff -u -r12331 -r17177 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.js (.../tousseGroupView.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousseGroup/tousseGroupView.js (.../tousseGroupView.js) (revision 17177) @@ -101,22 +101,22 @@ var sign = true; var tbar = [ { text : '添加', - hidden : false, + hidden : SSTS_TousseGroup_Create, iconCls : 'btn_ext_application_add', handler : function() { addAndEditContainer(0); } }, '-', { text : '修改', - hidden : false, + hidden : SSTS_TousseGroup_Update, iconCls : 'btn_ext_application_edit', id : 'editTbar', handler : function() { loadFormData(grid); } }, '-', { text : '删除', - hidden : false, + hidden : SSTS_TousseGroup_Delete, iconCls : 'btn_ext_application_del', handler : function() { deleteContainer(grid); Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r17150 -r17177 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 17150) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 17177) @@ -423,16 +423,21 @@ - - - - - + + + + + + + + + + Fisheye: Tag 17177 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionView.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp =================================================================== diff -u -r17150 -r17177 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp (.../damageErrorMaterialTypeView.jsp) (revision 17150) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp (.../damageErrorMaterialTypeView.jsp) (revision 17177) @@ -20,27 +20,27 @@