From aa2601ac456b35d1f991649e27288bd46f7b4a79 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Jun 2024 09:15:17 +0200 Subject: [PATCH] feat(WorkerFormation): add columnFilter --- src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue index 02a3cdba2..97d829140 100644 --- a/src/pages/Worker/Card/WorkerFormation.vue +++ b/src/pages/Worker/Card/WorkerFormation.vue @@ -37,7 +37,9 @@ const columns = computed(() => [ fields: ['id', 'name'], }, disable: false, - inWhere: true, + columnFilter: { + inWhere: true, + }, }, { align: 'left', @@ -60,7 +62,6 @@ const columns = computed(() => [ align: 'left', name: 'centerFk', label: t('worker.formation.tableVisibleColumns.center'), - field: 'centerFk', create: true, component: 'select', attrs: { @@ -68,7 +69,9 @@ const columns = computed(() => [ fields: ['id', 'name'], }, disable: false, - inWhere: true, + columnFilter: { + inWhere: true, + }, }, { align: 'left', @@ -90,20 +93,13 @@ const columns = computed(() => [ name: 'remark', label: t('worker.formation.tableVisibleColumns.remark'), create: true, - chip: { - color: null, - condition: (value) => value, - }, + component: 'checkbox', }, { align: 'left', name: 'hasDiploma', label: t('worker.formation.tableVisibleColumns.hasDiploma'), create: true, - chip: { - color: null, - condition: (value) => value, - }, }, ]); @@ -113,7 +109,7 @@ const columns = computed(() => [ data-key="WorkerFormation" :url="`Workers/${entityId}/trainingCourse`" :url-create="`Workers/${entityId}/trainingCourse`" - :user-filter="courseFilter" + :filter="courseFilter" :create="{ urlCreate: 'trainingCourses', title: 'Create trainingCourse',