Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js
===================================================================
diff -u -r24039 -r24040
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24039)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleInformation.js	(.../scheduleInformation.js)	(revision 24040)
@@ -33,9 +33,6 @@
 		scheduleDefinitionArray.push(json);
 	}
 	
-	
-	
-	
 	var voList=jsonRevert(scheduleInformations.data);
 	var times=scheduleInformations.conditionTimes;
 		
@@ -110,7 +107,7 @@
                 },
                 formatter: function (value, row,index) {	
                 		if(isUndefinedOrNullOrEmpty(value)){
-                			value="无";
+                			value="休";
                 		}
                 		var result="<a href=\"#\" >"+value+"</a";//row[dateKey]
                 		return result;
@@ -402,14 +399,32 @@
 		 var endDate=$("#dateTo_input").val();
 		 var userId=$("#name").val();
 		 //同时都有值
-		 if(!isUndefinedOrNullOrEmpty(startDate)&&!isUndefinedOrNullOrEmpty(endDate)){
+		 var isSearch=true;
+		 
+		 if(isUndefinedOrNullOrEmpty(startDate) ^ isUndefinedOrNullOrEmpty(endDate)){
+			 alert("请同时选择开始及截至时间，请重新选择!");
+			 isSearch=false;
+		 }else if(!isUndefinedOrNullOrEmpty(startDate)&&!isUndefinedOrNullOrEmpty(endDate)){
 			 if(dateCompare(endDate,startDate)==1){
 				 alert("截至时间不能小于开始查询时间!");
+				 isSearch=false;
 			 }else{
 				 var days=timeDifferenceNums(startDate, endDate);
 				 if(days>31){
 					 alert("查询天数最多为一个月!");
-				 }else{
+					 isSearch=false; 
+				 }
+			 }
+			 
+		 }
+		 
+		  if(isUndefinedOrNullOrEmpty(startDate)&&isUndefinedOrNullOrEmpty(endDate)&&isUndefinedOrNullOrEmpty(userId)){
+			 alert("请至少选择一个查询条件!");
+			 isSearch=false;
+		 }
+		 
+		if(isSearch){
+				
 					 //重现获取一遍
 					 //先摧毁
 					 $("#table").bootstrapTable('destroy');
@@ -434,7 +449,7 @@
 								alert("error");
 							}
 						});
-						console.log(scheduleInformations);
+						if(!isUndefinedOrNullOrEmpty(scheduleInformations)){
 						 voList=jsonRevert(scheduleInformations.data);
 						 times=scheduleInformations.conditionTimes;
 							
@@ -509,7 +524,7 @@
 					                },
 					                formatter: function (value, row,index) {	
 					                		if(isUndefinedOrNullOrEmpty(value)){
-					                			value="无";
+					                			value="休";
 					                		}
 					                		var result="<a href=\"#\" >"+value+"</a";//row[dateKey]
 					                		return result;
@@ -520,6 +535,9 @@
 							columns.push(c1);
 							columns.push(data);
 							columns.push(weeks);
+					}else{
+						voList=[];
+					}
 						
 						$("#table").bootstrapTable({
 							// url:"http://mockjs",
@@ -568,14 +586,12 @@
 					            }
 						});
 						/*重新加载-----end*/
-
-						
-				 }
+				
 			 }
-		 }
 		 
 		 
 		 
+		 
 	 });
 //“查询"按钮事件--end
 	 
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js
===================================================================
diff -u -r24034 -r24040
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js	(.../scheduleDefinitionHistory.js)	(revision 24034)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinitionHistory.js	(.../scheduleDefinitionHistory.js)	(revision 24040)
@@ -61,7 +61,7 @@
                                 },
                                 {
                                     title : '操作时间',
-                                    field : 'orgUnitName',
+                                    field : 'lastUpdateTime',
                                     align : 'center'
                                 },
                                 {
Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
===================================================================
diff -u -r24038 -r24040
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24038)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 24040)
@@ -100,20 +100,19 @@
     $("#select_department").append(handlerDepartment_select);
     
     //添加表单--点击按钮跳出时间选择框
-//     $("#startWorkTime,#offWorkTime").click(function(){
-//    	 var t=$(this).attr("id")+"_input";
-//    	 initSchedulingDate(t);
-////    	 WdatePicker({el:t,dateFmt:'HH:mm'});
-//     });
+     $("#startWorkTime,#offWorkTime").click(function(){
+    	 var t=$(this).attr("id")+"_input";
+    	 WdatePicker({el:t,dateFmt:'HH:mm'});
+     });
      
-     initSchedulingDate("startWorkTime_input");
-     initSchedulingDate("offWorkTime_input");
-     function initSchedulingDate(idStr){
-	 	$('#' + idStr).datetimepicker({
-		    format: 'HH:mm',
-		    language:'zh_CN'
-		})
-	}
+//     initSchedulingDate("startWorkTime_input");
+//     initSchedulingDate("offWorkTime_input");
+//     function initSchedulingDate(idStr){
+//	 	$('#' + idStr).datetimepicker({
+//		    format: 'HH:mm',
+//		    language:'zh_CN'
+//		})
+//	}
     var scheduleDefinitions=getAllScheduleDefinition();
     
     //"班次名称"输入框输入完成后校验是否已存在相同的名称的班次定义