Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -213,6 +213,7 @@ import { computed, onMounted, ref, watch } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import { useQuasar } from 'quasar'
|
||||
import { useOrderProductionItemStore } from 'src/stores/OrderProductionItemStore'
|
||||
import { normalizeSearchText } from 'src/utils/searchText'
|
||||
|
||||
const route = useRoute()
|
||||
const $q = useQuasar()
|
||||
@@ -278,18 +279,18 @@ function formatDate (val) {
|
||||
}
|
||||
|
||||
const filteredProducts = computed(() => {
|
||||
const needle = String(productSearch.value || '').toLowerCase()
|
||||
const needle = normalizeSearchText(productSearch.value)
|
||||
if (!needle) return productOptions.value.slice(0, 50)
|
||||
return productOptions.value.filter(p =>
|
||||
String(p?.ProductCode || '').toLowerCase().includes(needle)
|
||||
normalizeSearchText(p?.ProductCode).includes(needle)
|
||||
).slice(0, 50)
|
||||
})
|
||||
|
||||
const filteredRows = computed(() => {
|
||||
const needle = String(descFilter.value || '').toLowerCase().trim()
|
||||
const needle = normalizeSearchText(descFilter.value)
|
||||
if (!needle) return rows.value
|
||||
return rows.value.filter(r =>
|
||||
String(r?.OldDesc || '').toLowerCase().includes(needle)
|
||||
normalizeSearchText(r?.OldDesc).includes(needle)
|
||||
)
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user