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

Merge branch 'develop' into devTee

Browse source 
# Conflicts:
#	src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
This commit is contained in:
STW_TTTY\stwtt 2024-05-14 15:50:10 +07:00
commit f5ed387f35
8 changed files with 292 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
View file

@ -357,36 +357,42 @@ watch(
</div>
</q-td>
<td>
<!-- <div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'"> -->
<q-btn
flat
round
icon="mdi-developer-board"
color="blue-6"
size="12px"
dense
@click="openPopupProgress(props.row.id)"
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
"
>
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
</q-btn>
<q-btn
flat
round
icon="warning"
color="red-5"
size="12px"
dense
main="problem"
@click="openPopupProblem(props.row.id)"
>
<q-tooltip>รายงานปัญหา</q-tooltip>
</q-btn>
<!-- </div> -->
<q-btn
flat
round
icon="mdi-developer-board"
color="blue-6"
size="12px"
dense
@click="openPopupProgress(props.row.id)"
>
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
</q-btn>
<q-btn
flat
round
icon="warning"
color="red-5"
size="12px"
dense
main="problem"
@click="openPopupProblem(props.row.id)"
>
<q-tooltip>รายงานปัญหา</q-tooltip>
</q-btn>
</div>
<div
v-if="
store.dataEvaluation.evaluationStatus === 'NEW' &&
store.rolePerson === 'USER'
store.rolePerson === 'USER' &&
store.tabMain === '1'
"
>
<q-btn

21
src/modules/08_KPI/components/Tab/Topic/02_Competency.vue
View file

@ -290,14 +290,7 @@ onMounted(() => {
<q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span>
</q-th>
<q-th
auto-width
v-if="
store.dataEvaluation.evaluationStatus === 'NEW' &&
store.rolePerson === 'USER'
"
/>
<q-th auto-width/>
<q-th auto-width />
</q-tr>
</template>
<template v-slot:body="props">
@ -359,8 +352,13 @@ onMounted(() => {
{{ col.value }}
</div>
</q-td>
<q-td auto-width>
<div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'">
<q-td>
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
"
>
<q-btn
flat
round
@ -389,7 +387,8 @@ onMounted(() => {
<div
v-if="
store.dataEvaluation.evaluationStatus === 'NEW' &&
store.rolePerson === 'USER'
store.rolePerson === 'USER' &&
store.tabMain === '1'
"
>
<q-btn

10
src/modules/08_KPI/components/Tab/Topic/03_Develop.vue
View file

@ -287,7 +287,12 @@ onMounted(() => {
</div>
</q-td>
<q-td>
<div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'">
<div
v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '1'
"
>
<q-btn
flat
round
@ -316,7 +321,8 @@ onMounted(() => {
<div
v-if="
store.dataEvaluation.evaluationStatus === 'NEW' &&
store.rolePerson === 'USER'
store.rolePerson === 'USER' &&
store.tabMain === '2'
"
>
<q-btn