Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -96,6 +96,7 @@
|
||||
import { ref, computed } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { usePermission } from 'src/composables/usePermission'
|
||||
import { normalizeSearchText } from 'src/utils/searchText'
|
||||
|
||||
const { canRead, canWrite } = usePermission()
|
||||
|
||||
@@ -175,9 +176,10 @@ const filters = ref({
|
||||
|
||||
const filteredRows = computed(() => {
|
||||
return rows.value.filter(r => {
|
||||
const workOrderNoNeedle = normalizeSearchText(filters.value.workOrderNo)
|
||||
if (
|
||||
filters.value.workOrderNo &&
|
||||
!r.workOrderNo.includes(filters.value.workOrderNo)
|
||||
workOrderNoNeedle &&
|
||||
!normalizeSearchText(r.workOrderNo).includes(workOrderNoNeedle)
|
||||
) return false
|
||||
|
||||
if (
|
||||
|
||||
Reference in New Issue
Block a user