diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue index 82458e21b..a59f0e9e8 100644 --- a/src/components/common/VnInputTime.vue +++ b/src/components/common/VnInputTime.vue @@ -2,7 +2,6 @@ import { watch, computed, ref, nextTick } from 'vue'; import { useI18n } from 'vue-i18n'; import { date } from 'quasar'; -import { nextTick } from 'vue'; const model = defineModel({ type: String }); const props = defineProps({ diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index 27b4982ee..91f2a61d7 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -42,26 +42,27 @@ const columns = computed(() => [ }, { align: 'left', - name: 'department', + name: 'departmentFk', label: t('tableColumns.department'), cardVisible: true, - component: 'select', - attrs: { - url: 'Departments', - fields: ['id', 'name'], - }, - columnField: { - component: null, + columnFilter: { + component: 'select', + inWhere: true, + alias: 'wd', + attrs: { + url: 'Departments', + }, }, + format: (row, dashIfEmpty) => dashIfEmpty(row.department), }, { align: 'left', name: 'email', label: t('tableColumns.email'), - component: 'input', cardVisible: true, - columnField: { - component: null, + columnFilter: { + alias: 'mu', + inWhere: true, }, }, {