diff --git a/Application/Admin/View/TestResource/index.html b/Application/Admin/View/TestResource/index.html
index 72d2a6bec..cfa496488 100644
--- a/Application/Admin/View/TestResource/index.html
+++ b/Application/Admin/View/TestResource/index.html
@@ -180,6 +180,11 @@
 </block>
 
 <block name="script">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
     <script>
         <volist name=":I('get.')" id="vo">
           Think.setValue('{$key}',"{$vo}");
@@ -189,8 +194,29 @@
         //导航高亮
         highlight_subnav('{:U('testResource/index')}');
         $(function(){
+
+            $('#time-start').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language:"zh-CN",
+                minView:2,
+                autoclose:true,endDate:new Date(),
+            });
+
+            $('#time-end').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language:"zh-CN",
+                minView:2,
+                autoclose:true,endDate:new Date(),
+            });
+
             //搜索功能
             $("#search").click(function(){
+
+                var starttime = $.trim($('#time-start').val());
+                var endtime = $.trim($('#time-end').val());
+
+                if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
                 var url = $(this).attr('url');
                 var query  = $('.jssearch').find('input').serialize();
                 query  += "&"+$('.jssearch').find('select').serialize();
diff --git a/Application/Admin/View/TestResource/lists.html b/Application/Admin/View/TestResource/lists.html
index e62fb5f99..80221e96a 100644
--- a/Application/Admin/View/TestResource/lists.html
+++ b/Application/Admin/View/TestResource/lists.html
@@ -199,6 +199,11 @@
 </block>
 
 <block name="script">
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+  <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
   <script>
     <volist name=":I('get.')" id="vo">
       Think.setValue('{$key}',"{$vo}");
@@ -207,7 +212,28 @@
   <script type="text/javascript">
     //导航高亮
     highlight_subnav('{:U('testResource/lists')}');
+
+    $('#time-start').datetimepicker({
+      format: 'yyyy-mm-dd',
+      language:"zh-CN",
+      minView:2,
+      autoclose:true,endDate:new Date(),
+    });
+
+    $('#time-end').datetimepicker({
+      format: 'yyyy-mm-dd',
+      language:"zh-CN",
+      minView:2,
+      autoclose:true,endDate:new Date(),
+    });
+
     $(function(){
+
+      var starttime = $.trim($('#time-start').val());
+      var endtime = $.trim($('#time-end').val());
+
+      if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
       //搜索功能
       $("#search").click(function(){
         var url = $(this).attr('url');