hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m56s
Details

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-12 14:25:51 +07:00
commit 8d83bd2b1e
4 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/Workflow/DialogSelectPerson.vue
View file

@ -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) => {
<q-th auto-width />
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">
{{ getColumnLabel(col, isAct) }}
{{ col.label }}
</span>
</q-th>
</q-tr>

5
src/modules/06_retirement/components/DialogAddCommander.vue
View file

@ -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"
>
<span class="text-weight-medium">{{
getColumnLabel(col, isAct)
}}</span>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>

5
src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue
View file

@ -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"
>
<span class="text-weight-medium">{{
getColumnLabel(col, isAct)
}}</span>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>

5
src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
View file

@ -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"
>
<span class="text-weight-medium">{{
getColumnLabel(col, isAct)
}}</span>
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
</q-tr>
</template>