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

แก้คำ ทับที่เป็น "นั่งทับตำแหน่ง" และปรับตำแหน่งไอคอน

Browse source
This commit is contained in:
Warunee Tamkoo 2024-07-24 23:44:47 +07:00
parent 007df38109
commit 86de5b29ae
6 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/02_organizationalNew/components/DialogSelectPerson.vue
View file

@ -625,11 +625,11 @@ watch([() => page.value, () => pageSize.value], () => {
/>
<div class="col-12">
<d-table
ref="table"
flat
:columns="columnsResult"
:rows="rowResult"
row-key="id"
ref="table"
flat
:columns="columnsResult"
:rows="rowResult"
row-key="id"
dense
class="custom-header-table"
:paging="true"
@ -706,7 +706,7 @@ watch([() => page.value, () => pageSize.value], () => {
color="primary"
dense
v-model="isSit"
label="ทับที่"
label="นั่งทับตำแหน่ง"
/>
</div>
</div>

30
src/modules/02_organizationalNew/components/TreeTable.vue
View file

@ -572,17 +572,6 @@ watch(
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-btn
flat
size="14px"
color="primary"
round
dense
@click="props.expand = !props.expand"
:icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
/>
</q-td>
<q-td>
<q-btn
flat
@ -686,6 +675,18 @@ watch(
</q-menu>
</q-btn>
</q-td>
<q-td>
<q-btn
flat
size="14px"
color="primary"
round
dense
@click="props.expand = !props.expand"
:icon="props.expand ? 'mdi-menu-down' : 'mdi-menu-right'"
/>
</q-td>
<q-td v-for="col in props.cols" :key="col.name" :props="props">
<div v-if="col.name == 'no'">
{{
@ -695,7 +696,11 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posMasterNo'">
{{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
{{
props.row.isSit
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>
<div v-else-if="col.name === 'posLevelName'">
{{
@ -710,7 +715,6 @@ watch(
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
<q-tr v-show="props.expand" :props="props">

6
src/modules/05_placement/components/PersonalList/CardPosition.vue
View file

@ -302,7 +302,9 @@ onMounted(async () => {
</div>
<div v-else-if="col.name === 'posMasterNo'">
{{
props.row.isSit ? col.value + " " + "(ทับที่)" : col.value
props.row.isSit
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>
<div v-else-if="col.name === 'isPosition'">
@ -438,7 +440,7 @@ onMounted(async () => {
<div v-else-if="col.name === 'posMasterNo'">
{{
props.row.isSit
? col.value + " " + "(ทับที่)"
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>

6
src/modules/08_registryEmployee/components/DialogSelectPos.vue
View file

@ -669,7 +669,7 @@ watch(
<div v-else-if="col.name === 'posMasterNo'">
{{
props.row.isSit
? col.value + " " + "(ทับที่)"
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>
@ -736,7 +736,7 @@ watch(
<div v-else-if="col.name === 'posMasterNo'">
{{
props.row.isSit
? col.value + " " + "(ทับที่)"
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>
@ -884,7 +884,7 @@ watch(
<div v-else-if="col.name === 'posMasterNo'">
{{
props.row.isSit
? col.value + " " + "(ทับที่)"
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>

2
src/modules/16_positionEmployee/components/DialogSelectPerson.vue
View file

@ -672,7 +672,7 @@ watch([() => page.value, () => pageSize.value], () => {
color="primary"
dense
v-model="isSit"
label="ทับที่"
label="นั่งทับตำแหน่ง"
/>
</div>
</div>

7
src/modules/16_positionEmployee/components/TreeTable.vue
View file

@ -587,7 +587,11 @@ watch(
}}
</div>
<div v-else-if="col.name === 'posMasterNo'">
{{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }}
{{
props.row.isSit
? col.value + " " + "(นั่งทับตำแหน่ง)"
: col.value
}}
</div>
<div v-else-if="col.name === 'posLevelName'">
{{
@ -602,7 +606,6 @@ watch(
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
<template v-slot:pagination="scope">