Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r28366 -r28387 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 28366) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 28387) @@ -954,7 +954,7 @@ {hidden :SSTS_ImportBaseData_manager,text:"导入导出基础数据",href:WWWROOT+'/disinfectsystem/basedatamanager/importbasedata/importBasedata.mhtml',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_IPAndOrgUnitMapping,text:"IP对应的默认科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/iPAndOrgUnitMapping/iPAndOrgUnitMappingView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GoodsBindingConfig,text:"物品绑定",href:WWWROOT+ '/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableForeignTousseApplicationCombo,text:"外来器械包组合",href:WWWROOT+'/disinfectsystem/CombinationKits/CombinationKitsView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_ForeignTousseApplication_Combo,text:"外来器械包组合",href:WWWROOT+'/disinfectsystem/CombinationKits/CombinationKitsView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GoodsFilterConfig,text:"物品黑白名单过滤设置",href:WWWROOT+'/disinfectsystem/goodFilterConfig/goodFilterTemplate.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_UrgentLevel_manager,text:"加急级别管理",href:WWWROOT+'/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_OperationRoom_manager,text:"手术间管理",href:WWWROOT+'/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r27499 -r28387 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27499) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 28387) @@ -2165,7 +2165,9 @@ */ var SSTS_ForeignTousseApplication_Combo = true; - SSTS_ForeignTousseApplication_Combo = false; + if(sstsConfig.enableForeignTousseApplicationCombo){ + SSTS_ForeignTousseApplication_Combo = false; + } /** * 《班次类型配置》权限 Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r28376 -r28387 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 28376) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 28387) @@ -1247,7 +1247,7 @@ valueField : 'id', displayField : 'name', width : 240, - listConfig: {width : 240}, + listConfig: {width : 270}, matchFieldWidth: false, store : foreignTousseJsonStore, pageSize : 12, @@ -1413,7 +1413,7 @@ }); } var tousseItem = Ext4.create('foreignTousseItemModel',{ - id : result.data[i].id, + //id : result.data[i].id, tousseDefinitionId : result.data[i].tousseDefinitionId, oldTousseName: result.data[i].name, tousseName: result.data[i].name,