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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-08-20 17:56:40 +07:00
commit af7ffe27ab
6 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/05_placement/components/probation/FormAssign.vue
View file

@ -1128,9 +1128,9 @@ onMounted(async () => {
dense dense
flat flat
round round
color="primary" color="edit"
@click="edit()" @click="edit()"
icon="mdi-pencil-outline" icon="edit"
> >
<q-tooltip>แก้ไขข้อมูล</q-tooltip> <q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn> </q-btn>

4
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
View file

@ -300,9 +300,9 @@ onMounted(async () => {
dense dense
flat flat
round round
color="primary" color="edit"
@click="edit()" @click="edit()"
icon="mdi-pencil-outline" icon="edit"
> >
<q-tooltip>แก้ไขข้อมูล</q-tooltip> <q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn> </q-btn>

4
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
View file

@ -422,9 +422,9 @@ onMounted(async () => {
dense dense
flat flat
round round
color="primary" color="edit"
@click="edit()" @click="edit()"
icon="mdi-pencil-outline" icon="edit"
> >
<q-tooltip>แก้ไขข้อมูล</q-tooltip> <q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn> </q-btn>

28
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
View file

@ -363,19 +363,27 @@ onMounted(async () => {
<div>แบบบันทึกผล (ผู้ดูเเล)</div> <div>แบบบันทึกผล (ผู้ดูเเล)</div>
<div v-if="status == false"> <div v-if="status == false">
<q-btn <q-btn
v-if="!checkRoutePermisson" v-if="!checkRoutePermisson"
dense dense
flat flat
round round
color="primary" color="edit"
@click="edit()" @click="edit()"
icon="mdi-pencil-outline" icon="edit"
> >
<q-tooltip>แก้ไขข้อมูล</q-tooltip> <q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn> </q-btn>
</div> </div>
<div v-else> <div v-else>
<q-btn dense flat round color="red" @click="cancel()" icon="mdi-undo" v-if="!checkRoutePermisson"> <q-btn
dense
flat
round
color="red"
@click="cancel()"
icon="mdi-undo"
v-if="!checkRoutePermisson"
>
<q-tooltip>ยกเลิก</q-tooltip> <q-tooltip>ยกเลิก</q-tooltip>
</q-btn> </q-btn>
<q-btn <q-btn
@ -530,7 +538,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class=" :class="
evaluate_ouptut[i]?.level == item.toString() && 'active' evaluate_ouptut[i]?.level == item.toString() && 'active'
@ -566,7 +574,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class="knowledge_level == item && 'active'" :class="knowledge_level == item && 'active'"
outline outline
@ -598,7 +606,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class="skill_level == item && 'active'" :class="skill_level == item && 'active'"
outline outline
@ -630,7 +638,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class="competency_level == item && 'active'" :class="competency_level == item && 'active'"
outline outline
@ -662,7 +670,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class="learn_level == item && 'active'" :class="learn_level == item && 'active'"
outline outline
@ -695,7 +703,7 @@ onMounted(async () => {
<q-item-section side> <q-item-section side>
<q-btn-group outline> <q-btn-group outline>
<q-btn <q-btn
:disable="!status" :disable="!status"
v-for="(item, index) in 5" v-for="(item, index) in 5"
:class="apply_level == item && 'active'" :class="apply_level == item && 'active'"
outline outline

4
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
View file

@ -378,9 +378,9 @@ onMounted(async () => {
dense dense
flat flat
round round
color="primary" color="edit"
@click="edit()" @click="edit()"
icon="mdi-pencil-outline" icon="edit"
> >
<q-tooltip>แก้ไขข้อมูล</q-tooltip> <q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn> </q-btn>

2
src/modules/08_registryEmployee/views/Main.vue
View file

@ -386,7 +386,7 @@ onMounted(() => {
</q-tr> </q-tr>
</template> </template>
<template v-slot:body="props"> <template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer"> <q-tr :props="props">
<q-td <q-td
auto-width auto-width
v-if=" v-if="