Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -67,7 +67,7 @@
                         } else {
                         } else {
                             layer.alert('请求成功');
                             layer.alert('请求成功');
                             setTimeout(function () {
                             setTimeout(function () {
-                                layer_close();
+                                layer_load('应用工具', '<?=site_url('tool/web');?>');
                             },500);
                             },500);
                         }
                         }
 
 

@@ -102,26 +102,7 @@
         ]
         ]
     });
     });
 
 
-    $.fn.dataTableExt.afnFiltering.push(
-        function (oSettings, aData, iDataIndex) {
-            var min = document.getElementById('min').value;
-            var max = document.getElementById('max').value;
-            var iDateCol = 12;
-
-            var dateMin = new Date(aData[iDateCol]);
-            var dateMax = new Date(aData[iDateCol]);
-
-            if (min === '' && max === '')
-                return true;
-            else if (new Date(min).getTime() <= dateMin.getTime() && max === '')
-                return true;
-            else if (new Date(min).getTime() <= dateMin.getTime() && new Date(max).getTime() >= dateMax.getTime())
-                return true;
-            return false;
-        }
-    );
-
-    $('.table_search').on('change', function () {
+    $('.table_search').on('keyup', function () {
         search = $(this).val();
         search = $(this).val();
         column = $(this).attr('column');
         column = $(this).attr('column');