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
This commit is contained in:
STW_TTTY\stwtt 2024-07-09 15:04:34 +07:00
commit 4cb827e65c
8 changed files with 63 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue
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"

21
src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue
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 || `${'กรุณากรอกความคิดเห็นของผู้บังคับบัญชาเหนือขึ้นไปอีกขั้นหนึ่ง'}`,]"

10
src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
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

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

@ -271,8 +271,10 @@ function onLevel(num: number, list: any) {
} }
const competencyType = ref<DataOptions[]>([]); const competencyType = ref<DataOptions[]>([]);
onMounted(async () => { onMounted(() => {
setTimeout(async () => { setTimeout(async () => {
// console.log("posTypeName===>", store.dataEvaluation.posTypeName);
competencyType.value = await (store.dataEvaluation.posTypeName == competencyType.value = await (store.dataEvaluation.posTypeName ==
"อำนวยการ" || store.dataEvaluation.posTypeName == "บริหาร" "อำนวยการ" || store.dataEvaluation.posTypeName == "บริหาร"
? store.competencyType.filter( ? store.competencyType.filter(
@ -426,8 +428,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 +522,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

10
src/modules/08_KPI/components/Tab/Topic/03_Develop.vue
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

4
src/modules/08_KPI/store.ts
View file

@ -134,7 +134,9 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
case "SUMMARY_COMMANDER_HIGH": case "SUMMARY_COMMANDER_HIGH":
return "รอผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่งตรวจสอบผล"; return "รอผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่งตรวจสอบผล";
case "COMPLETE": case "COMPLETE":
return "เสร็จสิ้น"; return "รอประกาศผลการประเมิน";
case "KP7":
return "ประกาศและลงทะเบียนประวัติแล้ว";
default: default:
break; break;
} }

4
src/modules/08_KPI/views/form.vue
View file

@ -61,9 +61,9 @@ const router = useRouter();
async function fetchEvaluation() { async function fetchEvaluation() {
await http await http
.get(config.API.kpiEvaluation + `/${id.value}`) .get(config.API.kpiEvaluation + `/${id.value}`)
.then(async (res) => { .then((res) => {
const data = res.data.result; const data = res.data.result;
store.dataEvaluation = await data; store.dataEvaluation = res.data.result;
formProfile.status = store.convertStatus(data.evaluationStatus); formProfile.status = store.convertStatus(data.evaluationStatus);
formProfile.result = store.convertResults(data.evaluationResults); formProfile.result = store.convertResults(data.evaluationResults);
// store.checkCompetency(); // store.checkCompetency();

7
src/modules/08_KPI/views/mainEvaluator.vue
View file

@ -184,11 +184,12 @@ watch(
} }
); );
function onChangTab() { async function onChangTab() {
store.formQuery.page = 1; store.formQuery.page = 1;
dataListMain.value = []; dataListMain.value = await [];
store.selected = await [];
fetchList(); fetchList();
store.selected = [];
} }
onMounted(async () => { onMounted(async () => {