test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: load more not working when between filter is applied

Browse Source
This commit is contained in:
Shariq Ansari 2024-02-28 13:44:34 +05:30
parent 8f95d97c79
commit 1622410d74
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/Controls/DateRangePicker.vue
View File

@ -105,8 +105,8 @@ export default {
Popover, Popover,
}, },
data() { data() {
const fromDate = this.value ? this.value.split(',')[0] : '' const fromDate = this.value ? this.value[0] : ''
const toDate = this.value ? this.value.split(',')[1] : '' const toDate = this.value ? this.value[1] : ''
return { return {
currentYear: null, currentYear: null,
currentMonth: null, currentMonth: null,

7
frontend/src/components/Filter.vue
View File

@ -182,13 +182,6 @@ function convertFilters(data, allFilters) {
value = ['equals', value[1] ? 'Yes' : 'No'] value = ['equals', value[1] ? 'Yes' : 'No']
} }
} }
// if (value[0] === 'LIKE' || value[0] === 'NOT LIKE') {
// value[1] = value[1].replace(/%/g, '')
// }
if (value[0] === 'between' && Array.isArray(value[1])) {
value[1] = value[1].join(',')
}
if (field) { if (field) {
f.push({ f.push({