搜索重构

@@ -72,4 +72,55 @@
     function msg(msg) {
     function msg(msg) {
         layer.msg(msg);
         layer.msg(msg);
     }
     }
+
+    $.extend( true, $.fn.dataTable.defaults, {
+        sDom: '<"top">rt<"bottom"ip><"clear">',
+        aaSorting: [[1, "desc"]],
+        serverSide: true,
+        processing: true,
+        bSort: false,
+        iDisplayLength: 6,
+        bLengthChange: false,
+        ajax: {
+            url: apiBaseUrl + $('#table').attr('url'),
+            dataFilter: function (json) {
+                var ret = {}, json = jQuery.parseJSON(json);
+                ret.data = json.data || [];
+                var draw = getUrlParam('draw');
+                if(draw) {
+                    ret.draw = draw;
+                }
+                ret.recordsTotal = 0;
+                ret.recordsFiltered = 0;
+                if (json.page) {
+                    ret.recordsTotal = parseInt(json.page.totalNumber);
+                    ret.recordsFiltered = parseInt(json.page.totalNumber);
+                }
+                return JSON.stringify(ret);
+            },
+            data: function (data) {
+                data.startTime = $('#min').val();
+                data.endTime = $('#max').val();
+                
+                data.pageSize = data.length;
+                data.currentPage = parseFloat(data.start / data.length) + 1;
+                return data;
+            }
+        },
+    });
+
+    $('.table_search').on('change', function () {
+        search = $(this).val();
+        column = $(this).attr('column');
+
+        $('#table').DataTable().column(column).search(search).draw();
+    });
+
+    $('#min, #max').on('keyup', function () {
+        $('#table').DataTable().draw();
+    });
+
+    function resetHandler() {
+        $('#table').DataTable().columns().search("").draw();
+    }
 </script>
 </script>

@@ -11,7 +11,7 @@
     </form>
     </form>
 
 
     <div class="body mt-20">
     <div class="body mt-20">
-        <table class="table table-border table-bordered table-bg" id="table">
+        <table class="table table-border table-bordered table-bg" id="table" url="/order/into/getAllApplyOrder">
             <thead class="text-c">
             <thead class="text-c">
             <tr>
             <tr>
                 <th width="68px">操作</th>
                 <th width="68px">操作</th>
@@ -43,36 +43,6 @@
 
 
 <script>
 <script>
     var table = $('#table').dataTable({
     var table = $('#table').dataTable({
-        aaSorting: [[1, "desc"]],
-        serverSide: true,
-        processing: true,
-        bSort: false,
-        searching: false,//是否显示搜索
-        iDisplayLength: 6,
-        bLengthChange: false,
-        ajax: {
-            url: apiBaseUrl + '/order/into/getAllApplyOrder',
-            dataFilter: function (json) {
-                var ret = {}, json = jQuery.parseJSON(json);
-                ret.data = json.data || [];
-                var draw = getUrlParam('draw');
-                if(draw) {
-                    ret.draw = draw;
-                }
-                ret.recordsTotal = 0;
-                ret.recordsFiltered = 0;
-                if (json.page) {
-                    ret.recordsTotal = parseInt(json.page.totalNumber);
-                    ret.recordsFiltered = parseInt(json.page.totalNumber);
-                }
-                return JSON.stringify(ret);
-            },
-            data: function (data) {
-                data.pageSize = data.length;
-                data.currentPage = parseFloat(data.start / data.length) + 1;
-                return data;
-            }
-        },
         columns: [
         columns: [
             {
             {
                 data: "id", render: function (data, type, full) {
                 data: "id", render: function (data, type, full) {
@@ -89,50 +59,16 @@
             {data: "idCard"},//身份证
             {data: "idCard"},//身份证
             {data: "phoneNumber"},//手机号
             {data: "phoneNumber"},//手机号
             {data: "createTime"},//进件时间
             {data: "createTime"},//进件时间
-            {data: "departmentName"},//网点
-            {data: "productName"},//产品名称
+            {name: "departmentId", data: "departmentName"},//网点
+            {name: "productId", data: "productName"},//产品名称
             {data: "applyMoney"},//申请金额
             {data: "applyMoney"},//申请金额
             {data: "agreeMoney"},//审批金额
             {data: "agreeMoney"},//审批金额
-            {data: "createUser"},//客户经理
-            {data: "statusDesc"},//流程节点
+            {name: "createUser", data: "createUserName"},//客户经理
+            {name: "status", data: "statusDesc"},//流程节点
             {data: "modifyTime"},//流转时间
             {data: "modifyTime"},//流转时间
-            {data: "modifyUser"}//处理人
+            {name: "modifyUser", data: "modifyUserName"}, //处理人
         ]
         ]
     });
     });
-
-    $.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 () {
-        search = $(this).val();
-        column = $(this).attr('column');
-
-        $('#table').DataTable().column(column).search(search).draw();
-    });
-
-    $('#min, #max').on('keyup', function () {
-        $('#table').DataTable().draw();
-    });
-
-    function resetHandler() {
-        $('#table').DataTable().columns().search("").draw();
-    }
 </script>
 </script>
 </body>
 </body>
 <html>
 <html>

 <div class="date mb-20">
 <div class="date mb-20">
-    <input type="text"
-           onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })"
-           id="min" class="input-text Wdate"> -
-    <input type="text"
-           onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })"
-           id="max" class="input-text Wdate">
+    <input type="text" onfocus="WdatePicker({ maxDate:'#F{$dp.$D(\'max\')||\'%y-%M-%d\'}',onpicked:function(){$('#table').DataTable().draw()} })" id="min" class="input-text Wdate"> -
+    <input type="text" onfocus="WdatePicker({ minDate:'#F{$dp.$D(\'min\')}',maxDate:'%y-%M-%d',onpicked:function(){$('#table').DataTable().draw()} })" id="max" class="input-text Wdate">
 </div>
 </div>
 <div class="row cl mb-20">
 <div class="row cl mb-20">
     <div class="col-xs-2">
     <div class="col-xs-2">