Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp =================================================================== diff -u -r12560 -r12600 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 12560) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp (.../addDepart.jsp) (revision 12600) @@ -15,32 +15,32 @@
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r12332 -r12600 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 12332) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 12600) @@ -709,7 +709,7 @@ var addButton = ""; var reduceButton = ""; var onclickFun = ""; - if(tousseType != '消毒物品' || '是' == isCleanedEntirely){ + if(tousseType != '消毒物品' || (tousseType == '消毒物品' && '是' == isApplyEntireTousse)){ addButton = '+'; reduceButton = '-'; onclickFun = 'onclick="openUpdateAmount(this,'+ row +');"'; @@ -1007,7 +1007,7 @@ recycleAmount = msg[i].amount; } addToussItem(i, '', msg[i].tousseName, - msg[i].amount, recycleAmount, '', msg[i].isCleanedEntirely, + msg[i].amount, recycleAmount, '',msg[i].isApplyEntireTousse, msg[i].isCleanedEntirely, msg[i].tousseType, '否', msg[i].depart, msg[i].applicationId); } Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r12562 -r12600 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 12562) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 12600) @@ -255,6 +255,7 @@ {hidden :SSTS_godownEntryNode_Menu,text:"入库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_WarehouseEntryOut_Menu,text:"退库单管理",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_stockTakeInfoNode_Menu,text:"一次性物品盘点管理",href:WWWROOT+'/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.jsp?type='+encodeURIComponent('一次性物品'),hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_JJJL_Menu,text:"一次性物品月盘点记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/stocktakerecordView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_godownEntryNode_Menu,text:"一次性物品采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true} ] },{ @@ -265,7 +266,8 @@ {hidden :SSTS_DiposableGoodsNode_Menu,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/stocktakeinfomanager/stockTakeInfoView.jsp?type='+encodeURIComponent('材料'),hrefTarget:linkTarget,leaf:true} + {hidden :SSTS_stockTakeInfoNode_Menu,text:"材料盘点管理",href:WWWROOT+'/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.jsp?type='+encodeURIComponent('材料'),hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_JJJL_Menu,text:"器械材料月盘点记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp',hrefTarget:linkTarget,leaf:true} ] },{ text:"同步入库单", @@ -289,6 +291,13 @@ {hidden :SSTS_DepartMentTousseManager,text:"科室器械包管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true} ] },{ + text:"干预管理", + singleClickExpand:singleClickExpandTree, + hidden:SSTS_InterfereManagerView, + children:[ + {hidden :SSTS_InterfereSterilizationRecord_ViewMenu,text:"灭菌记录干预管理",href:WWWROOT+'/disinfectsystem/interfere/interfereSterilizationView.jsp',hrefTarget:linkTarget,leaf:true} + ] +},{ text:"消毒供应中心物品领用", singleClickExpand:singleClickExpandTree, hidden:SSTS_ASSESTS_Get, @@ -334,14 +343,6 @@ //{hidden :SSTS_DeviceMonitoring_Menu,text:"设备监测信息",href:WWWROOT+'/disinfectsystem/deviceMonitoring/deviceMonitoringView.jsp',hrefTarget:linkTarget,leaf:true} ] },{ - text:"月结算记录", - singleClickExpand:singleClickExpandTree, - hidden:SSTS_JJJL_Menu, - children:[ - {hidden :SSTS_JJJL_Menu,text:"月结算记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/stocktakerecordView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_JJJL_Menu,text:"器械材料月盘点记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/materialCheckView.jsp',hrefTarget:linkTarget,leaf:true} - ] -},{ text:"消毒供应中心工作量统计报表", singleClickExpand:singleClickExpandTree, hidden:SSTS_WorkLoad_Menu, @@ -393,15 +394,15 @@ {hidden :SSTS_DepartmentMonthlyDetail,text:"明细核算月报",href:WWWROOT+'/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.jsp',hrefTarget:linkTarget,leaf:true}, // {hidden :SSTS_MonthPackageReport,text:"消毒灭菌包月报",href:WWWROOT+'/disinfectsystem/reportforms/monthPackageReportView.jsp',hrefTarget:linkTarget,leaf:true}, //{hidden :SSTS_MonthDiposableGoodsReport,text:"消毒供应中心物资收发月报",href:WWWROOT+'/disinfectsystem/reportforms/monthDiposableGoodsReportView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ReturnGoodsDetailReport,text:"退货查询报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"入库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :SSTS_TousseDeliverReport,text:"器械包发货明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverDetailView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseDeliverReport,text:"器械包各生产环节统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverDetailView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ForeignTousse_Recyc_Menu,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}, Index: ssts-web/src/main/webapp/search/searchresultsByExt.jsp =================================================================== diff -u -r12335 -r12600 --- ssts-web/src/main/webapp/search/searchresultsByExt.jsp (.../searchresultsByExt.jsp) (revision 12335) +++ ssts-web/src/main/webapp/search/searchresultsByExt.jsp (.../searchresultsByExt.jsp) (revision 12600) @@ -13,6 +13,7 @@ + <%@ include file="/common/includeExtJsAndCss.jsp"%> Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r12331 -r12600 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 12331) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 12600) @@ -491,6 +491,14 @@ //器械包管理模块 var SSTS_TousseManagerView = SSTS_TousseInstanceManager_ViewMenu && SSTS_TousseDefinitionManager_View && SSTS_DepartMentTousseManager; + +var SSTS_InterfereSterilizationRecord_ViewMenu = true; + +SSTS_InterfereSterilizationRecord_ViewMenu = false; + +//干预管理模块 +var SSTS_InterfereManagerView = SSTS_InterfereSterilizationRecord_ViewMenu; + var SSTS_ReturnGoodsRecord_Menu = true; SSTS_ReturnGoodsRecord_Menu = false; Index: ssts-web/src/main/webapp/js/configUtils.js =================================================================== diff -u -r12331 -r12600 --- ssts-web/src/main/webapp/js/configUtils.js (.../configUtils.js) (revision 12331) +++ ssts-web/src/main/webapp/js/configUtils.js (.../configUtils.js) (revision 12600) @@ -33,6 +33,18 @@ //alert('retValue='+retValue); return retValue; } +//从js文件获取某个str配置 +function getStrValueFromJs(p,defValue){ + var retValue = defValue; + var value = getValueFromJs(p); + if(value == undefined ){ + return retValue; + } + retValue = value+''; + //alert('p='+p); + //alert('retValue='+retValue); + return retValue; +} function getValueFromJs(p){ var retValue = undefined; if(typeof(p) == undefined ){ @@ -44,8 +56,8 @@ try{ retValue = eval(p); }catch(e){ - +// alert(e) } - //alert('retValue='+retValue); +// alert('retValue='+retValue); return retValue; } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp =================================================================== diff -u -r12331 -r12600 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 12600) @@ -21,9 +21,9 @@ parent.LAYER.close(index); } - function addToussItem(tousseName,isCleanedEntirely,tousseType,isThereIdentificationCard){ + function addToussItem(tousseName,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard){ var row = window.parent.document.getElementById("tousseItemTable").rows.length; - window.parent.addToussItem(row,'',tousseName,0,1,0,isCleanedEntirely,tousseType,isThereIdentificationCard); + window.parent.addToussItem(row,'',tousseName,0,1,0,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard); closeLayer(); } @@ -49,7 +49,7 @@ var htmlResultCode = "