Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r27499 -r27601 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27499) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27601) @@ -353,7 +353,7 @@ hidden:SSTS_DisposableGoods_Manager, children:[ {hidden :SSTS_DisposableGoods_Menu,text:"一次性物品管理",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable=是',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable='+encodeURI('是'),hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoods_Menu || !sstsConfig.enableExpensiveDisposableGoods,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsStock_Manager,text:"一次性物品库存",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_DisposableGoodsStock_Manager || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true}, @@ -445,7 +445,7 @@ {hidden :SSTS_TousseMaintain_Manager,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}, {hidden :SSTS_DepartMentTousseManager,text:"基数管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+inventoryTypeCodeBaseAmount,hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+encodeURI(inventoryTypeCodeBaseAmount),hrefTarget:linkTarget,leaf:true} ] },{ text:"手术仪器管理", Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r27398 -r27601 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 27398) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 27601) @@ -1605,26 +1605,27 @@ } function gopage(v){ + var params = encodeURI(v); if(v == recall){//召回页面 addTab('recallRecord','器械包召回',WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp'); }else if(v ==disabledGoods || v == diposableGoods){ - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp?queryType='+v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/diposableGoods/diposableGoodsWarningView.jsp?queryType='+params); }else if(v == warningTousseGoods || v == disabledTousseGoods){ - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType='+v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp?warningType='+params); }else if(v == warningMaterialGoods ){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?warning=warning'); }else if(v == warningCertification || v == disabledCertification){ - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.jsp?queryType='+v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.jsp?queryType='+params); }else if(v == warningExpensiveGoods || v == warningMaxExpensiveGoods){ - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsWarningView.jsp?queryType='+v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsWarningView.jsp?queryType='+params); }else if(v == warningExpensiveGoodsBill){ - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.jsp?queryType='+v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.jsp?queryType='+params); }else if(v == warningSupplierCertificate){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/basedatamanager/supplier/supplierView.jsp?warningStatus=true'); }else if(v == warningContract){ addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/contract/contractWarningView.jsp'); }else if(v == warningDeviceMaintenance || v == warningDeviceMaintenanceOutDate){//设备维护提前预警及过期告警管理点击后进入设备维护列表页面 - addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp?warningItemType=' + v); + addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp?warningItemType=' + params); } warningWindow.close(); }