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

Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop

Browse source
This commit is contained in:
setthawutttty 2025-03-26 10:18:25 +07:00
commit 5b07feb52b
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/10_registry/02_Government/07_Position.vue
View file

@ -561,7 +561,7 @@ onMounted(async () => {
icon="mdi-history" icon="mdi-history"
@click="onHistory(props.row.id)" @click="onHistory(props.row.id)"
> >
<q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip> <q-tooltip>ประวัติแก้ไขตำแหน่ง</q-tooltip>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>
@ -580,7 +580,7 @@ onMounted(async () => {
class="absolute_button" class="absolute_button"
@click="onHistory(props.row.id)" @click="onHistory(props.row.id)"
> >
<q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip> <q-tooltip>ประวัติแก้ไขตำแหน่ง</q-tooltip>
</q-btn> </q-btn>
<q-item v-for="col in props.cols" :key="col.name"> <q-item v-for="col in props.cols" :key="col.name">
<q-item-section class="fix_top"> <q-item-section class="fix_top">

8
src/modules/10_registry/03_Salary/01_Salary.vue
View file

@ -657,7 +657,7 @@ onMounted(async () => {
<div class="col-12"> <div class="col-12">
<q-toolbar class="q-px-none"> <q-toolbar class="q-px-none">
<span class="text-blue-6 text-weight-bold text-body1">{{ <span class="text-blue-6 text-weight-bold text-body1">{{
`ตำแหน่ง/${salaryText}` `${salaryText}`
}}</span> }}</span>
<q-space /> <q-space />
<q-input <q-input
@ -741,7 +741,7 @@ onMounted(async () => {
icon="mdi-history" icon="mdi-history"
@click="onHistory(props.row.id)" @click="onHistory(props.row.id)"
> >
<q-tooltip>{{`ประวัติแก้ไขตำแหน่ง/${salaryText}`}}</q-tooltip> <q-tooltip>{{ `ประวัติแก้ไข${salaryText}` }}</q-tooltip>
</q-btn> </q-btn>
</q-td> </q-td>
</q-tr> </q-tr>
@ -760,7 +760,7 @@ onMounted(async () => {
class="absolute_button" class="absolute_button"
@click="onHistory(props.row.id)" @click="onHistory(props.row.id)"
> >
<q-tooltip>{{`ประวัติแก้ไขตำแหน่ง/${salaryText}`}}</q-tooltip> <q-tooltip>{{ `ประวัติแก้ไข${salaryText}` }}</q-tooltip>
</q-btn> </q-btn>
<q-item v-for="col in props.cols" :key="col.name"> <q-item v-for="col in props.cols" :key="col.name">
<q-item-section class="fix_top"> <q-item-section class="fix_top">
@ -782,7 +782,7 @@ onMounted(async () => {
</div> </div>
<DialogHistory <DialogHistory
v-model:modal="modalHistory" v-model:modal="modalHistory"
:title="`ประวัติแก้ไขตำแหน่ง/${salaryText}`" :title="`ประวัติแก้ไข${salaryText}`"
:getData="getHistory" :getData="getHistory"
:rows="rowsHistory" :rows="rowsHistory"
:rows-data="rowsHistoryData" :rows-data="rowsHistoryData"

2
src/modules/11_probation/views/mainDetail.vue
View file

@ -414,7 +414,7 @@ onMounted(async () => {
class="absolute_button" class="absolute_button"
@click="onDetail(props.row.id)" @click="onDetail(props.row.id)"
> >
<q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip> <q-tooltip>ดูรายละเอียด</q-tooltip>
</q-btn> </q-btn>
<q-item v-for="col in props.cols" :key="col.name"> <q-item v-for="col in props.cols" :key="col.name">
<q-item-section class="fix_top"> <q-item-section class="fix_top">