แสดง รายละเอียดความก้าวหน้า, ปัญหา และเหตุการณืใน tab สรุปผล แต่ไม่ให้เพิ่ม/แก้ไข
This commit is contained in:
parent
7072bcff94
commit
aa643f2b9c
5 changed files with 51 additions and 27 deletions
|
|
@ -276,7 +276,11 @@ watch(
|
|||
<template v-slot:before>
|
||||
<div class="q-pa-sm">
|
||||
<q-btn
|
||||
v-if="store.rolePerson === 'USER'"
|
||||
v-if="
|
||||
store.rolePerson === 'USER' &&
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
"
|
||||
icon="add"
|
||||
color="teal"
|
||||
flat
|
||||
|
|
@ -390,7 +394,8 @@ watch(
|
|||
dense
|
||||
:readonly="
|
||||
formDataView.reasonEvaluator !== null ||
|
||||
store.rolePerson !== 'EVALUATOR'
|
||||
store.rolePerson !== 'EVALUATOR' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
label="ความคิดเห็นของผู้ประเมิน"
|
||||
v-model="reasonEvaluator"
|
||||
|
|
@ -405,7 +410,9 @@ watch(
|
|||
<div
|
||||
v-if="
|
||||
formDataView.reasonEvaluator == null &&
|
||||
store.rolePerson == 'EVALUATOR'
|
||||
store.rolePerson == 'EVALUATOR' &&
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
"
|
||||
class="col-12"
|
||||
align="right"
|
||||
|
|
@ -446,7 +453,8 @@ watch(
|
|||
lazy-rules
|
||||
:readonly="
|
||||
formDataView.reasonCommander !== null ||
|
||||
store.rolePerson !== 'COMMANDER'
|
||||
store.rolePerson !== 'COMMANDER' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
|
||||
|
|
@ -456,7 +464,9 @@ watch(
|
|||
<div
|
||||
v-if="
|
||||
formDataView.reasonCommander == null &&
|
||||
store.rolePerson == 'COMMANDER'
|
||||
store.rolePerson == 'COMMANDER' &&
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
"
|
||||
class="col-12"
|
||||
align="right"
|
||||
|
|
@ -496,7 +506,8 @@ watch(
|
|||
lazy-rules
|
||||
:readonly="
|
||||
formDataView.reasonCommanderHigh !== null ||
|
||||
store.rolePerson !== 'COMMANDERHIGH'
|
||||
store.rolePerson !== 'COMMANDERHIGH' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
|
||||
|
|
@ -506,7 +517,9 @@ watch(
|
|||
<div
|
||||
v-if="
|
||||
formDataView.reasonCommanderHigh == null &&
|
||||
store.rolePerson == 'COMMANDERHIGH'
|
||||
store.rolePerson == 'COMMANDERHIGH' &&
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
"
|
||||
class="col-12"
|
||||
align="right"
|
||||
|
|
|
|||
|
|
@ -254,11 +254,13 @@ watch(
|
|||
<div class="q-pa-sm">
|
||||
<q-btn
|
||||
v-if="
|
||||
type == 'capacity' ||
|
||||
type == 'development' ||
|
||||
(type != 'capacity' &&
|
||||
type != 'development' &&
|
||||
store.rolePerson == 'USER')
|
||||
(type == 'capacity' ||
|
||||
type == 'development' ||
|
||||
(type != 'capacity' &&
|
||||
type != 'development' &&
|
||||
store.rolePerson == 'USER')) &&
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
"
|
||||
icon="add"
|
||||
color="teal"
|
||||
|
|
@ -405,7 +407,8 @@ watch(
|
|||
dense
|
||||
:readonly="
|
||||
formDataView.reasonEvaluator !== null ||
|
||||
store.rolePerson !== 'EVALUATOR'
|
||||
store.rolePerson !== 'EVALUATOR' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
label="ความคิดเห็นของผู้ประเมิน"
|
||||
v-model="reasonEvaluator"
|
||||
|
|
@ -461,7 +464,8 @@ watch(
|
|||
lazy-rules
|
||||
:readonly="
|
||||
formDataView.reasonCommander !== null ||
|
||||
store.rolePerson !== 'COMMANDER'
|
||||
store.rolePerson !== 'COMMANDER' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไป'}`,]"
|
||||
|
|
@ -511,7 +515,8 @@ watch(
|
|||
lazy-rules
|
||||
:readonly="
|
||||
formDataView.reasonCommanderHigh !== null ||
|
||||
store.rolePerson !== 'COMMANDERHIGH'
|
||||
store.rolePerson !== 'COMMANDERHIGH' ||
|
||||
store.tabMain !== '2'
|
||||
"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"
|
||||
|
|
|
|||
|
|
@ -348,8 +348,9 @@ const isEditStep3 = computed(() => {
|
|||
<td>
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
@ -437,8 +438,9 @@ const isEditStep3 = computed(() => {
|
|||
<q-card-actions
|
||||
align="around"
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -426,8 +426,9 @@ onMounted(async () => {
|
|||
<q-td>
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
@ -519,8 +520,9 @@ onMounted(async () => {
|
|||
<q-card-actions
|
||||
align="around"
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -314,8 +314,9 @@ onMounted(() => {
|
|||
<q-td>
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
@ -442,8 +443,9 @@ onMounted(() => {
|
|||
<q-card-actions
|
||||
align="around"
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2'
|
||||
(store.dataEvaluation.evaluationStatus == 'APPROVE' &&
|
||||
store.tabMain === '2') ||
|
||||
store.tabMain === '3'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue