webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated report

Browse Source
This commit is contained in:
franknstayn
2021-10-16 17:20:58 +08:00
parent a663b8e899
commit 6c3679b55a
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/views/user-layouts/user_template.blade.php
View File

@@ -704,7 +704,7 @@
var min = $('#min').datepicker("getDate");
var max = $('#max').datepicker("getDate");
var startDate = new Date(data[10]);
var startDate = new Date(data[12]);
if (min == null && max == null) {
return true;
}
@@ -743,7 +743,7 @@
extend: 'csv',
exportOptions: {
// columns: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
},
className: "btn btn-default",
text: "<i class=\"fa fa-table\"></i> CSV",
@@ -754,7 +754,7 @@
{
extend: 'excel',
exportOptions: {
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
columns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
},
className: "btn btn-default",
text: "<i class=\"fa fa-file-excel-o\"></i> Excel",
@@ -793,12 +793,12 @@
// }
],
columnDefs: [{
targets: 10,
targets: 12,
type: 'date',
visible: false
},
{
targets: 10,
targets: 12,
type: 'date'
}
],