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

@@ -99,21 +99,31 @@
                 return JSON.stringify(ret);
                 return JSON.stringify(ret);
             },
             },
             data: function (data) {
             data: function (data) {
-                data.startTime = $('#min').val();
-                data.endTime = $('#max').val();
-                
+
                 data.pageSize = data.length;
                 data.pageSize = data.length;
                 data.currentPage = parseFloat(data.start / data.length) + 1;
                 data.currentPage = parseFloat(data.start / data.length) + 1;
                 return data;
                 return data;
-            }
+            },
+        },
+        fnServerParams: function (aoData) {
+            delete aoData.columns;
+
+            aoData.startTime = $('#min').val() || '';
+            aoData.endTime = $('#max').val() || '';
+            aoData.departmentId = $('[name="departmentId"]').val() || '';
+            aoData.productId = $('[name="productId"]').val() || '';
+            aoData.createUser = $('[name="createUser"]').val() || '';
+            aoData.status = $('[name="status"]').val() || '';
+            aoData.modifyUser = $('[name="modifyUser"]').val() || '';
         },
         },
     });
     });
 
 
     $('.table_search').on('change', function () {
     $('.table_search').on('change', function () {
-        search = $(this).val();
-        column = $(this).attr('column');
+        $('#table').DataTable().draw();
+    });
 
 
-        $('#table').DataTable().column(column).search(search).draw();
+    $('.table_search').on('keyup', function () {
+        $('#table').DataTable().draw();
     });
     });
 
 
     $('#min, #max').on('keyup', function () {
     $('#min, #max').on('keyup', function () {