Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r37356 -r37453 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 37356) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 37453) @@ -7,6 +7,7 @@ var reviewPackingMenu ; var sterilizationRecordMenu ; var storageMenu; +var washAndDisinfectMenu; //使用记录鼠标移入的菜单 var useRecordMenu ; //用来判断Ext4.onReady执行完没有(selenium自动测试需要用到这个变量,请不要删除) @@ -488,6 +489,7 @@ var useRecordImg = getById('useRecordImg'); var invoicePlanImg = getById('invoicePlanImg'); var quickJumpGroupStorageImg = getById('quickJumpGroupStorageImg'); + var washAndDisinfectImg = getById('washAndDisinfectImg'); if((packingImg || comboToussePackingImg || reviewPackingImg || sterilizationRecordImg || quickJumpGroupStorageImg) || (useRecordImg && hasTwoUseRecordOperation)){ @@ -605,6 +607,45 @@ } } } + + //ZJYY-135:清洗机分组 + if(washAndDisinfectImg){ + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/rinserGroupAction!loadRinserGroupList.do', + method: 'POST', + async:true, + params : { + "orgUnitCode":currentDepartCode + }, + success : function(response, options){ + var result = Ext.decode(response.responseText, true); + if(result.success){ + washAndDisinfectMenu = new Ext4.menu.Menu({ + floating: true + }); + + for(var i=0;i'; return returnContent; } + + //ZJYY-135:清洗机分组,washAndDisinfectImg + if(itemId == 'washAndDisinfect' && sstsConfig.enableRinserGroupFunction){ + returnContent += '
  • '; + returnContent += '

    '; + returnContent += ''+item['title']+'
  • '; + return returnContent; + } if(itemId != 'packing' && itemId !='sterilizationRecord'){ //SZYK-26:reviewModuleVersion审核版本