Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r33100 -r34915
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 33100)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 34915)
@@ -481,6 +481,46 @@
     location.href=WWWROOT + "/disinfectsystem/assestManagement/tousseGoods/departTousseGoodsWarningView.jsp";
 }
 
+function timeToString(valueType,startOrEnd){
+	var time = '';
+	var startTime = '';
+	var endTime = '';
+	if(valueType == 2){
+		var time = Date.parse(newDate);
+		startTime = time + 1*24*60*60*1000;
+		endTime = time + 3*24*60*60*1000;
+	}else if(valueType == 3){
+		var time = Date.parse(newDate);
+		startTime = time + 1*24*60*60*1000;
+		endTime = time + 7*24*60*60*1000;
+	}else if(valueType == 4){
+		var time = Date.parse(newDate);
+		startTime = time + 1*24*60*60*1000;
+		endTime = time + 30*24*60*60*1000;
+	}
+	if(startOrEnd == 'start'){
+		var date = new Date(startTime);
+		return date;
+	}else {
+		var date = new Date(endTime);
+		return date;
+	}
+}
+
+function setExpDateTime(valueType){
+	var startTime = '';
+	var endTime = '';
+	if(valueType == 1){
+		startTime = newDate;
+		endTime = newDate;
+	}else {
+		startTime = timeToString(valueType,'start')
+		endTime = timeToString(valueType,'end')
+	}
+	Ext.getCmp('startTime').setValue(startTime);
+	Ext.getCmp('endTime').setValue(endTime);
+}
+
 Ext.onReady(function(){
     Ext.QuickTips.init();
     Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
@@ -601,26 +641,63 @@
         }
     },'-',{
         xtype : 'label',
-    	text : '开始时间：'
+    	text : '失效日期：'
     },{
+        xtype : 'combo',
+        id : 'expDate',
+        name : 'expDate',
+        valueField : 'value',
+        displayField : 'text',
+        store : new Ext.data.SimpleStore({
+            fields : ['text','value'],
+            data :  [
+				['全部',0],
+				['今天',1],
+				['未来3天',2],
+				['未来7天',3],
+				['未来30天',4],
+				['选择日期范围',5]
+			]
+        }),
+        forceSelection : true,
+        mode : 'local',
+        editable:false,
+        triggerAction : 'all',
+        width : 120,
+        value : '',
+        listeners : {
+            select : function(combo,record,index ){
+                if(combo.getValue() == 5){
+					Ext.getCmp('startTime').setValue('');
+					Ext.getCmp('endTime').setValue('');
+					Ext.getCmp('startTime').show();
+					Ext.getCmp('endTime').show();
+				}else {
+					Ext.getCmp('startTime').setValue('');
+					Ext.getCmp('endTime').setValue('');
+					Ext.getCmp('startTime').hide();
+					Ext.getCmp('endTime').hide();
+				}
+            }
+        }
+    },{
 		xtype : 'datefieldWithMin',
 		id : 'startTime',
 		name : 'startTime',
 		format : 'Y-m-d',
+		hidden:true,
 		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 		listeners : {
 			select : function(_this) {
 				$Id('parm_s_startTime').value = Ext.util.Format.date(_this.getValue(), 'Y-m-d');
 			}
 		}
-	},'-',{
-        xtype : 'label',
-    	text : '结束时间：'
-    },{
+	},{
 		xtype : 'datefieldWithMin',
 		id : 'endTime',
 		name : 'endTime',
 		format : 'Y-m-d',
+		hidden:true,
 		altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 		listeners : {
 			select : function(_this) {
@@ -630,6 +707,10 @@
 	},'-',{
 		text : ' 查询  ',
 		handler : function() {
+			var expDate = Ext.getCmp('expDate').getValue();
+			if(expDate !== 0 && expDate !== '' && expDate !== 5){
+				setExpDateTime(expDate);
+			}
 			grid.dwrReload();
 		}
 	}]
@@ -678,8 +759,8 @@
         title : '器械包物品告警列表',
         tbar : tbarForFirstRow,
         pageSize : 20,
-//        defaultSortField : 'validUntil',//排序性能很慢,先去掉
-//        defaultSortDirection : 'ASC',
+       	defaultSortField : 'validUntil',//排序性能很慢,先去掉
+       	defaultSortDirection : 'ASC',
         isCheckboxSelectionModel : true,
         rememberSelected : false,
         isShowSearchField : true,
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp
===================================================================
diff -u -r30411 -r34915
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 30411)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.jsp	(.../tousseGoodsWarningView.jsp)	(revision 34915)
@@ -2,6 +2,8 @@
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
 <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO"%>
 <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
@@ -26,6 +28,8 @@
 	request.setAttribute("orgUnitName",orgUnitName);
 	request.setAttribute("orgUnitCoding",orgUnitCoding);
 	request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    SimpleDateFormat dateFormat =new SimpleDateFormat("yyyy-MM-dd");
+	request.setAttribute("newDate", dateFormat.format(new Date()));
  %>
 <script type="text/javascript">
     var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
@@ -38,6 +42,7 @@
 	var orgUnitName = '${orgUnitName}';
 	var orgUnitCoding = '${orgUnitCoding}';
 	var userName = '${userName}';
+    var newDate = '${newDate}';
 
 	//扫描篮筐允许的篮筐状态集合
     var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';