diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue index 10e969781..baac6052f 100644 --- a/src/components/Workflow/DialogSelectPerson.vue +++ b/src/components/Workflow/DialogSelectPerson.vue @@ -5,7 +5,6 @@ import { useQuasar } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; import http from "@/plugins/http"; import config from "@/app.config"; -import { getColumnLabel } from "@/utils/function"; import type { QTableProps } from "quasar"; @@ -254,7 +253,7 @@ watch(modal, (val) => { - {{ getColumnLabel(col, isAct) }} + {{ col.label }} diff --git a/src/modules/06_retirement/components/DialogAddCommander.vue b/src/modules/06_retirement/components/DialogAddCommander.vue index 1bbb81a43..e4d3c697a 100644 --- a/src/modules/06_retirement/components/DialogAddCommander.vue +++ b/src/modules/06_retirement/components/DialogAddCommander.vue @@ -4,7 +4,6 @@ import { useQuasar, type QTableProps } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import { getColumnLabel } from "@/utils/function"; import { useCounterMixin } from "@/stores/mixin"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -309,9 +308,7 @@ watch( :key="col.name" :props="props" > - {{ - getColumnLabel(col, isAct) - }} + {{ col.label }} diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue index f3c2e682f..e7697ce5b 100644 --- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue +++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue @@ -4,7 +4,6 @@ import { useQuasar, type QTableProps } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; -import { getColumnLabel } from "@/utils/function"; import { useCounterMixin } from "@/stores/mixin"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -319,9 +318,7 @@ watch( :key="col.name" :props="props" > - {{ - getColumnLabel(col, isAct) - }} + {{ col.label }} diff --git a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue index 3084779b3..35293eb89 100644 --- a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue +++ b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue @@ -4,7 +4,6 @@ import { useQuasar, type QTableProps } from "quasar"; import { usePagination } from "@/composables/usePagination"; import { useCounterMixin } from "@/stores/mixin"; -import { getColumnLabel } from "@/utils/function"; import http from "@/plugins/http"; import config from "@/app.config"; @@ -274,9 +273,7 @@ watch(modal, (newVal) => { :key="col.name" :props="props" > - {{ - getColumnLabel(col, isAct) - }} + {{ col.label }}