Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js =================================================================== diff -u -r35830 -r37171 --- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 35830) +++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 37171) @@ -660,7 +660,7 @@ //{hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, - //{hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ForeignTousseSterilizationMonitorAndDelivery,text:"含植入物器械包灭菌监测及发放情况报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseSterilizationMonitorAndDelivery.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_ForeignTousseAfterUseDelivery,text:"外来器械使用后交接报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseAfterUseDelivery.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_UrgentNeedGoodsProcessingCycle,text:"急用物品处理周期统计报表",href:WWWROOT+'/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp',hrefTarget:linkTarget,leaf:true}, @@ -756,7 +756,7 @@ {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak =================================================================== diff -u -r34810 -r37171 --- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak (.../menuconfigure.js.bak) (revision 34810) +++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js.bak (.../menuconfigure.js.bak) (revision 37171) @@ -438,7 +438,8 @@ hidden:!SSTS_InstrumentGoodsManagement || !enableSurgicalInstrumentsManagement, children:[ {hidden :SSTS_Tousse,text:"仪器班物品管理",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :isEnableTousseUnReturnWarn == 'false',text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true} ] },{ text:"干预管理", Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js =================================================================== diff -u -r36992 -r37171 --- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js (.../config.js) (revision 36992) +++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/config.js (.../config.js) (revision 37171) @@ -160,7 +160,7 @@ //是否启用手术间管理 enableOperationRoomManagerViwe: true, //外来器械申请单是否允许申请多套外来器械包 - //allowApplyMultipleForeignTousse: true, + allowApplyMultipleForeignTousse: true, //是否允许外来器械部分发货 allowPartlyInvoiceForeignTousse: true, //外来器械是否可以入同一篮筐 @@ -207,7 +207,9 @@ //是否启用手术仪器管理，默认为不启用 enableSurgicalInstrumentsManagement:true, //手术仪器管理别名配置 - aliasNameOfSurgicalInstrumentsManagement:[ {"fieldName":"tousseLocationManagement","displayText":"器械包位置管理"}, {"fieldName":"recipient","displayText":"领用人"}], + aliasNameOfSurgicalInstrumentsManagement:[ {"fieldName":"tousseLocationManagement","displayText":"器械包交接管理"}, {"fieldName":"recipient","displayText":"领用人"}], + //是否启用手术仪器追溯查询报表 + enableTousseTraceabilityInquiry:true, //不同灭菌方式的提示方式，PC和PDA都使用相同的提示方式。1悬浮提示。2弹框手工确认提示。 alerModeofDiffsterileMethod:2, //装配时选择物品后是否自动设置灭菌程序，默认为是 @@ -218,6 +220,12 @@ isHideBtnBatchAddTousse:true, //灭菌装载是否启用首尾条码机制 enableBeginEndBarcodeScan:false, + //外来器械申请时显示原始包定义还是现实最近一次申请的包定义 + isShowForeignTousseAncestorDefinitionForApply:true, + //开启显示待发货物品的来源信息功能 + enableShowToSendGoodsSourcesInfo:true, + //是否允许供应室用户替申请科室归还物品 + allowInsteadReturn:true, //启用外来器械申请单的审核功能 enableReviewOfForeignTousseApplicationFunction:true, //开启显示待发货物品的来源信息功能