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

fixing bug comment kpi

Browse source
This commit is contained in:
Warunee Tamkoo 2024-06-30 01:23:13 +07:00
parent 9c126bfba9
commit e92af2c195
1 changed files with 62 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/modules/08_KPI/components/Tab/04_Result.vue
View file

@ -433,9 +433,7 @@ onMounted(() => {
bordered bordered
class="q-mt-md" class="q-mt-md"
v-if=" v-if="
store.rolePerson == 'COMMANDER' && evaluatorComment !== null && store.dataEvaluation.commanderId !== null
evaluatorComment !== null &&
store.dataEvaluation.commanderId !== null
" "
> >
<q-form greedy @submit.prevent @validation-success="onSubmitCommander"> <q-form greedy @submit.prevent @validation-success="onSubmitCommander">
@ -456,7 +454,11 @@ onMounted(() => {
val="true" val="true"
:disable=" :disable="
store.dataEvaluation.evaluationStatus !== store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER' 'SUMMARY_COMMANDER' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
)
" "
label="เห็นด้วยกับผลการประเมิน" label="เห็นด้วยกับผลการประเมิน"
@click="resetCommander()" @click="resetCommander()"
@ -469,7 +471,11 @@ onMounted(() => {
label="มีความเห็นต่าง ดังนี้" label="มีความเห็นต่าง ดังนี้"
:disable=" :disable="
store.dataEvaluation.evaluationStatus !== store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER' 'SUMMARY_COMMANDER' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
)
" "
/> />
</div> </div>
@ -482,7 +488,12 @@ onMounted(() => {
outlined outlined
:readonly=" :readonly="
superiorCommentCheck == 'true' || superiorCommentCheck == 'true' ||
store.dataEvaluation.evaluationStatus !== 'SUMMARY_COMMANDER' store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER' && store.rolePerson === 'COMMANDER'
)
" "
type="textarea" type="textarea"
label="ความเห็นของผู้บังคับบัญชาเหนือขึ้นไป" label="ความเห็นของผู้บังคับบัญชาเหนือขึ้นไป"
@ -493,17 +504,20 @@ onMounted(() => {
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
<q-separator
v-if="store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER'" <div
/> v-if="
<q-card-actions store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER' &&
align="right" store.rolePerson === 'COMMANDER'
v-if="store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER'" "
> >
<q-btn label="บันทึก" color="secondary" type="submit" <q-separator />
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn <q-card-actions align="right">
> <q-btn label="บันทึก" color="secondary" type="submit"
</q-card-actions> ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>
</q-card-actions>
</div>
</q-form> </q-form>
</q-card> </q-card>
@ -511,8 +525,8 @@ onMounted(() => {
bordered bordered
class="q-mt-md" class="q-mt-md"
v-if=" v-if="
store.rolePerson == 'COMMANDERHIGH' && store.dataEvaluation.evaluationStatus !== 'SUMMARY' &&
superiorComment !== '' && store.dataEvaluation.evaluationStatus !== 'SUMMARY_COMMANDER' &&
store.dataEvaluation.commanderHighId !== null store.dataEvaluation.commanderHighId !== null
" "
> >
@ -527,6 +541,7 @@ onMounted(() => {
> >
</q-toolbar> </q-toolbar>
<q-separator /> <q-separator />
<q-card-section> <q-card-section>
<div class="row q-col-gutter-sm"> <div class="row q-col-gutter-sm">
<div class="col-12"> <div class="col-12">
@ -534,7 +549,12 @@ onMounted(() => {
<q-radio <q-radio
:disable=" :disable="
store.dataEvaluation.evaluationStatus !== store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER_HIGH' 'SUMMARY_COMMANDER_HIGH' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER_HIGH' &&
store.rolePerson === 'COMMANDERHIGH'
)
" "
v-model="additionalSuperiorCheck" v-model="additionalSuperiorCheck"
checked-icon="task_alt" checked-icon="task_alt"
@ -546,7 +566,12 @@ onMounted(() => {
<q-radio <q-radio
:disable=" :disable="
store.dataEvaluation.evaluationStatus !== store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER_HIGH' 'SUMMARY_COMMANDER_HIGH' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER_HIGH' &&
store.rolePerson === 'COMMANDERHIGH'
)
" "
v-model="additionalSuperiorCheck" v-model="additionalSuperiorCheck"
checked-icon="task_alt" checked-icon="task_alt"
@ -568,28 +593,32 @@ onMounted(() => {
:readonly=" :readonly="
additionalSuperiorCheck == 'true' || additionalSuperiorCheck == 'true' ||
store.dataEvaluation.evaluationStatus !== store.dataEvaluation.evaluationStatus !==
'SUMMARY_COMMANDER_HIGH' 'SUMMARY_COMMANDER_HIGH' ||
!(
store.dataEvaluation.evaluationStatus ==
'SUMMARY_COMMANDER_HIGH' &&
store.rolePerson === 'COMMANDERHIGH'
)
" "
:rules="[(val:string) => additionalSuperiorCheck !== 'false'||!!val || `${'กรุณากรอกความเห็น'}`,]" :rules="[(val:string) => additionalSuperiorCheck !== 'false'||!!val || `${'กรุณากรอกความเห็น'}`,]"
/> />
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
<q-separator
<div
v-if=" v-if="
store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH' store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH' &&
" store.rolePerson === 'COMMANDERHIGH'
/>
<q-card-actions
align="right"
v-if="
store.dataEvaluation.evaluationStatus == 'SUMMARY_COMMANDER_HIGH'
" "
> >
<q-btn label="บันทึก" color="secondary" type="submit" <q-separator />
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn <q-card-actions align="right">
> <q-btn label="บันทึก" color="secondary" type="submit"
</q-card-actions> ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>
</q-card-actions>
</div>
</q-form> </q-form>
</q-card> </q-card>
</div> </div>