Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp =================================================================== diff -u -r19308 -r19414 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 19308) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 19414) @@ -50,6 +50,7 @@ var enableEditBtn = false; var enableSaveBtn = false; var enableSaveAndNewBtn = false; +var onlyShowDisable = '${param.onlyShowDisable}'; //是否只加载已经停用的材料 enableEditBtn = true; @@ -68,5 +69,8 @@ +
+ +
\ No newline at end of file Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java =================================================================== diff -u -r18549 -r19414 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java (.../MaterialDefinitionTableManager.java) (revision 18549) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/dwr/table/MaterialDefinitionTableManager.java (.../MaterialDefinitionTableManager.java) (revision 19414) @@ -11,6 +11,7 @@ import org.apache.commons.lang.StringUtils; +import com.forgon.Constants; import com.forgon.component.grid.GridManager; import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; @@ -54,6 +55,13 @@ // String spelling = sqlWhereParamMap.get("spelling"); String sql = "where 1=1 "; + Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); + String onlyShowDisable = sqlWhereParamMap.get("onlyShowDisable"); //是否只显示停用的材料 + if ("yes".equals(onlyShowDisable)) { + sql += String.format(" and po.disable='%s' ", Constants.STR_YES); + } else { + sql += String.format(" and (po.disable<>'%s' or po.disable is null) ", Constants.STR_YES); + } /* * if(StringUtils.isNotBlank(spelling)){ sql = sql + * "and po.spelling = '" +spelling + "'"; } @@ -127,6 +135,13 @@ } parameterMap.put("grid_search_query", queryKey); } + Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); + String onlyShowDisable = sqlWhereParamMap.get("onlyShowDisable"); //是否只显示停用的材料 + if ("yes".equals(onlyShowDisable)) { + sql += String.format(" and po.disable='%s' ", Constants.STR_YES); + } else { + sql += String.format(" and (po.disable<>'%s' or po.disable is null) ", Constants.STR_YES); + } sql += " and po.minStorage > 0 and po.storage <= po.minStorage "; return gridManager.renderGrid(parameterMap, MaterialDefinition.class.getSimpleName(), sql, new String[] { Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r19197 -r19414 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 19197) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 19414) @@ -326,6 +326,7 @@ hidden:SSTS_MaterialStock_Manager, children:[ {hidden :SSTS_Material,text:"材料管理",href:WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_Material,text:"停用的材料",href:WWWROOT+'/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MaterialGodownEntry_Manager,text:"材料入库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialEntryView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MaterialCancellingStocks_Manager,text:"材料退库管理",href:WWWROOT+'/disinfectsystem/materialmanager/materialOutView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MaterialCheck_Manager,text:"材料盘点管理",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type=material',hrefTarget:linkTarget,leaf:true}, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js =================================================================== diff -u -r19366 -r19414 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 19366) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 19414) @@ -37,6 +37,16 @@ } } +/** + * 材料停用背景顔色修改 + */ +function disable(v,data){ + if(v == "是"){ + return "

"+v+"

"; + }else{ + return v; + } +} function downLoadImageFile(id){ location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id; @@ -122,6 +132,7 @@ Ext.onReady(function() { Ext.QuickTips.init(); // 记录cookie(3步) + $Id('parm_s_onlyShowDisable').value = onlyShowDisable; var columns = [ { header : "器械名称", width : 150, @@ -180,7 +191,8 @@ },{ header : "是否停用", width : 70, - dataIndex : 'disable' + dataIndex : 'disable', + renderer : disable },{ header : "拼音码", width : 60,