Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r16066 -r16101 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 16066) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 16101) @@ -352,6 +352,7 @@ hidden:SSTS_TousseManagerView, children:[ {hidden :SSTS_TousseDefinitionManager_View,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_TousseDefinitionManager_View,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_ForeignTousse_Recyc_Menu,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java =================================================================== diff -u -r14910 -r16101 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 14910) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java (.../TousseDefinitionTableManager.java) (revision 16101) @@ -91,6 +91,14 @@ } else {// 二级供应室 sql += " and po.handlerDepartCode='" + currentOrgUnitCode + "' "; }*/ + List parameterList = parameterMap.get("parm_s_onlyShowDisable"); + if (!parameterList.isEmpty() + && parameterList.size() > 0 + && "yes".equals(parameterList.get(0))) { //只显示停用的器械包 + sql += " and po.isDisable = '是' "; + } else { + sql += " and po.isDisable != '是' "; + } sql += " and (po.forDisplay = 1 or po.forDisplay is null)"; return gridManager.renderGrid(parameterMap, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js =================================================================== diff -u -r15891 -r16101 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 15891) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 16101) @@ -155,7 +155,7 @@ Ext.onReady(function() { Ext.QuickTips.init(); // 记录cookie(3步) - + $Id('parm_s_onlyShowDisable').value = onlyShowDisable; var columns = [ {header : "器械包名称",width : 180,dataIndex : 'name', renderer : modifyRecord}, {header : "器械包类别",width : 90,dataIndex : 'tousseType'}, @@ -231,7 +231,7 @@ } }, '-', { text : '添加外来器械包', - hidden : SSTS_Tousse_Create, + hidden : true, iconCls : 'btn_ext_add_foreignTousse', handler : function() { addAndEditForeignTousseDefinition(0); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp =================================================================== diff -u -r13067 -r16101 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 13067) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 16101) @@ -1,9 +1,9 @@ <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%> -<%@ page contentType="text/html; charset=UTF-8" pageEncoding="utf-8"%> -<%@ include file="/common/taglibs.jsp"%> -<%@ page import="com.forgon.tools.SpringBeanManger" %> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="utf-8"%> +<%@include file="/common/taglibs.jsp"%> +<%@page import="com.forgon.tools.SpringBeanManger" %> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> @@ -18,6 +18,7 @@ request.setAttribute("userName", userName); request.setAttribute("imageType", ImageFile.IMAGE_TYPE_TOUSSE); request.setAttribute("videoType", VideoFile.VIDEO_TYPE_TOUSSE); +request.setAttribute("onlyShowDisable", request.getParameter("onlyShowDisable")); if(currentOrgUnitCode!=null){ request.setAttribute("currentOrgUnitCode", currentOrgUnitCode); request.setAttribute("departCode", departCode); @@ -75,6 +76,8 @@ var enableSaveAndNewBtn = false; var imageType = '${imageType}'; var videoType = '${videoType}'; +var onlyShowDisable = '${onlyShowDisable}'; //是否只加载已经停用的器械包 + enableEditBtn = true; @@ -107,9 +110,12 @@ cellpadding="0" cellspacing="0"> -
+
+
+ +
\ No newline at end of file