Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -800,6 +800,7 @@ import dayjs from 'dayjs'
|
||||
import api from 'src/services/api.js'
|
||||
import { useAuthStore } from 'src/stores/authStore'
|
||||
import { formatDateInput, formatDateDisplay } from 'src/utils/formatters'
|
||||
import { normalizeSearchText } from 'src/utils/searchText'
|
||||
import { usePermission } from 'src/composables/usePermission'
|
||||
|
||||
const { canRead, canWrite, canUpdate, canExport } = usePermission()
|
||||
@@ -1956,13 +1957,13 @@ function filterCari(val, update) {
|
||||
return
|
||||
}
|
||||
|
||||
const needle = val.toLowerCase()
|
||||
const needle = normalizeSearchText(val)
|
||||
|
||||
update(() => {
|
||||
filteredCariOptions.value = cariOptions.value.filter(opt => {
|
||||
const kod = (opt.Cari_Kod || '').toLowerCase()
|
||||
const ad = (opt.Cari_Ad || '').toLowerCase()
|
||||
const unvan = (opt.Unvan || '').toLowerCase()
|
||||
const kod = normalizeSearchText(opt.Cari_Kod)
|
||||
const ad = normalizeSearchText(opt.Cari_Ad)
|
||||
const unvan = normalizeSearchText(opt.Unvan)
|
||||
return `${kod} ${ad} ${unvan}`.includes(needle)
|
||||
})
|
||||
})
|
||||
@@ -2575,9 +2576,9 @@ function filterModel(val, update) {
|
||||
return
|
||||
}
|
||||
update(() => {
|
||||
const needle = val.toLowerCase()
|
||||
const needle = normalizeSearchText(val)
|
||||
filteredModelOptions.value = modelOptions.value.filter(v =>
|
||||
(v.label || '').toLowerCase().includes(needle)
|
||||
normalizeSearchText(v.label).includes(needle)
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user