แสดง รายละเอียดความก้าวหน้า, ปัญหา และเหตุการณืใน tab สรุปผล แต่ไม่ให้เพิ่ม/แก้ไข

This commit is contained in:
Warunee Tamkoo 2024-07-09 11:37:47 +07:00
parent 7072bcff94
commit aa643f2b9c
5 changed files with 51 additions and 27 deletions

View file

@ -276,7 +276,11 @@ watch(
<template v-slot:before> <template v-slot:before>
<div class="q-pa-sm"> <div class="q-pa-sm">
<q-btn <q-btn
v-if="store.rolePerson === 'USER'" v-if="
store.rolePerson === 'USER' &&
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
"
icon="add" icon="add"
color="teal" color="teal"
flat flat
@ -390,7 +394,8 @@ watch(
dense dense
:readonly=" :readonly="
formDataView.reasonEvaluator !== null || formDataView.reasonEvaluator !== null ||
store.rolePerson !== 'EVALUATOR' store.rolePerson !== 'EVALUATOR' ||
store.tabMain !== '2'
" "
label="ความคิดเห็นของผู้ประเมิน" label="ความคิดเห็นของผู้ประเมิน"
v-model="reasonEvaluator" v-model="reasonEvaluator"
@ -405,7 +410,9 @@ watch(
<div <div
v-if=" v-if="
formDataView.reasonEvaluator == null && formDataView.reasonEvaluator == null &&
store.rolePerson == 'EVALUATOR' store.rolePerson == 'EVALUATOR' &&
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
" "
class="col-12" class="col-12"
align="right" align="right"
@ -446,7 +453,8 @@ watch(
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommander !== null || formDataView.reasonCommander !== null ||
store.rolePerson !== 'COMMANDER' store.rolePerson !== 'COMMANDER' ||
store.tabMain !== '2'
" "
hide-bottom-space hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]" :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
@ -456,7 +464,9 @@ watch(
<div <div
v-if=" v-if="
formDataView.reasonCommander == null && formDataView.reasonCommander == null &&
store.rolePerson == 'COMMANDER' store.rolePerson == 'COMMANDER' &&
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
" "
class="col-12" class="col-12"
align="right" align="right"
@ -496,7 +506,8 @@ watch(
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommanderHigh !== null || formDataView.reasonCommanderHigh !== null ||
store.rolePerson !== 'COMMANDERHIGH' store.rolePerson !== 'COMMANDERHIGH' ||
store.tabMain !== '2'
" "
hide-bottom-space hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]" :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
@ -506,7 +517,9 @@ watch(
<div <div
v-if=" v-if="
formDataView.reasonCommanderHigh == null && formDataView.reasonCommanderHigh == null &&
store.rolePerson == 'COMMANDERHIGH' store.rolePerson == 'COMMANDERHIGH' &&
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
" "
class="col-12" class="col-12"
align="right" align="right"

View file

@ -254,11 +254,13 @@ watch(
<div class="q-pa-sm"> <div class="q-pa-sm">
<q-btn <q-btn
v-if=" v-if="
type == 'capacity' || (type == 'capacity' ||
type == 'development' || type == 'development' ||
(type != 'capacity' && (type != 'capacity' &&
type != 'development' && type != 'development' &&
store.rolePerson == 'USER') store.rolePerson == 'USER')) &&
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2'
" "
icon="add" icon="add"
color="teal" color="teal"
@ -405,7 +407,8 @@ watch(
dense dense
:readonly=" :readonly="
formDataView.reasonEvaluator !== null || formDataView.reasonEvaluator !== null ||
store.rolePerson !== 'EVALUATOR' store.rolePerson !== 'EVALUATOR' ||
store.tabMain !== '2'
" "
label="ความคิดเห็นของผู้ประเมิน" label="ความคิดเห็นของผู้ประเมิน"
v-model="reasonEvaluator" v-model="reasonEvaluator"
@ -461,7 +464,8 @@ watch(
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommander !== null || formDataView.reasonCommander !== null ||
store.rolePerson !== 'COMMANDER' store.rolePerson !== 'COMMANDER' ||
store.tabMain !== '2'
" "
hide-bottom-space hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]" :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
@ -511,7 +515,8 @@ watch(
lazy-rules lazy-rules
:readonly=" :readonly="
formDataView.reasonCommanderHigh !== null || formDataView.reasonCommanderHigh !== null ||
store.rolePerson !== 'COMMANDERHIGH' store.rolePerson !== 'COMMANDERHIGH' ||
store.tabMain !== '2'
" "
hide-bottom-space hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]" :rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"

View file

@ -348,8 +348,9 @@ const isEditStep3 = computed(() => {
<td> <td>
<div <div
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn
@ -437,8 +438,9 @@ const isEditStep3 = computed(() => {
<q-card-actions <q-card-actions
align="around" align="around"
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn

View file

@ -426,8 +426,9 @@ onMounted(async () => {
<q-td> <q-td>
<div <div
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn
@ -519,8 +520,9 @@ onMounted(async () => {
<q-card-actions <q-card-actions
align="around" align="around"
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn

View file

@ -314,8 +314,9 @@ onMounted(() => {
<q-td> <q-td>
<div <div
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn
@ -442,8 +443,9 @@ onMounted(() => {
<q-card-actions <q-card-actions
align="around" align="around"
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'APPROVE' && (store.dataEvaluation.evaluationStatus == 'APPROVE' &&
store.tabMain === '2' store.tabMain === '2') ||
store.tabMain === '3'
" "
> >
<q-btn <q-btn