8300fec1 by yangjianbin

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

2 parents be477444 9210bd36
......@@ -67,7 +67,7 @@
} else {
layer.alert('请求成功');
setTimeout(function () {
layer_close();
layer_load('应用工具', '<?=site_url('tool/web');?>');
},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();
column = $(this).attr('column');
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!