updated
This commit is contained in:
parent
f453b95f32
commit
c3cc2e0aeb
7 changed files with 484 additions and 168 deletions
|
|
@ -218,6 +218,41 @@ onMounted(() => {
|
|||
:fetchList="fetchListPlanned"
|
||||
:total="totalResults1"
|
||||
/>
|
||||
|
||||
<q-table
|
||||
flat
|
||||
dense
|
||||
bordered
|
||||
:rows="[
|
||||
{
|
||||
name: 'รวมผลการประเมิน (ร้อยละ)',
|
||||
value: store.excusiveIndicator1PercentVal,
|
||||
},
|
||||
{
|
||||
name: 'ผลการประเมินมิติที่ 1 (คะแนน)',
|
||||
value: store.excusiveIndicator1ScoreVal,
|
||||
},
|
||||
]"
|
||||
:columns="[
|
||||
{
|
||||
name: 'name',
|
||||
field: 'name',
|
||||
label: 'name',
|
||||
style: 'font-size: 14px',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
field: 'value',
|
||||
label: 'value',
|
||||
style: 'font-size: 14px; font-weight: bold',
|
||||
},
|
||||
]"
|
||||
row-key="name"
|
||||
hide-header
|
||||
hide-bottom
|
||||
class="q-mt-xs q-mb-md"
|
||||
/>
|
||||
|
||||
<Work
|
||||
v-model:data="rows_03"
|
||||
:title="`มิติที่ 2 วาระเร่งด่วนที่ได้รับมอบหมายพิเศษ (ถ้ามี)`"
|
||||
|
|
@ -225,6 +260,54 @@ onMounted(() => {
|
|||
:fetchList="fetchAssigned"
|
||||
:total="totalResults3"
|
||||
/>
|
||||
|
||||
<q-table
|
||||
flat
|
||||
dense
|
||||
bordered
|
||||
:rows="[
|
||||
{
|
||||
name: 'รวมผลการประเมิน (ร้อยละ)',
|
||||
value: store.excusiveIndicator2PercentVal,
|
||||
},
|
||||
{
|
||||
name: 'ผลการประเมินมิติที่ 2 (คะแนน)',
|
||||
value: store.excusiveIndicator2ScoreVal,
|
||||
},
|
||||
]"
|
||||
:columns="[
|
||||
{
|
||||
name: 'name',
|
||||
field: 'name',
|
||||
label: 'name',
|
||||
style: 'font-size: 14px',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
field: 'value',
|
||||
label: 'value',
|
||||
style: 'font-size: 14px; font-weight: bold',
|
||||
},
|
||||
]"
|
||||
row-key="name"
|
||||
hide-header
|
||||
hide-bottom
|
||||
class="q-mt-xs q-mb-md"
|
||||
/>
|
||||
|
||||
<div class="row text-body2 text-weight-bold">
|
||||
<div class="col-12 text-center row justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินผลสัมฤทธิ์ของงาน (มิติที่ 1 + มิติที่ 2)
|
||||
(คะแนนเต็ม
|
||||
{{ store.excusiveIndicatorScore }}
|
||||
คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">
|
||||
{{ store.indicatorScoreVal }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
|
|
@ -249,25 +332,48 @@ onMounted(() => {
|
|||
:fetchList="fetchAssigned"
|
||||
:total="totalResults3"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="row text-body2 text-weight-bold">
|
||||
<!-- <div class="col-6 text-center row justify-center">
|
||||
<span>รวมผลการประเมิน (ร้อยละ) 100</span>
|
||||
<div class="text-primary q-pl-md">{{ total }}</div>
|
||||
</div> -->
|
||||
<q-table
|
||||
flat
|
||||
dense
|
||||
bordered
|
||||
:rows="[
|
||||
{
|
||||
name: 'รวมผลการประเมิน (ร้อยละ)',
|
||||
value: store.indicatorPercentVal,
|
||||
},
|
||||
]"
|
||||
:columns="[
|
||||
{
|
||||
name: 'name',
|
||||
field: 'name',
|
||||
label: 'name',
|
||||
style: 'font-size: 14px',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
field: 'value',
|
||||
label: 'value',
|
||||
style: 'font-size: 14px; font-weight: bold',
|
||||
},
|
||||
]"
|
||||
row-key="name"
|
||||
hide-header
|
||||
hide-bottom
|
||||
class="q-mt-xs q-mb-md"
|
||||
/>
|
||||
|
||||
<div class="col-12 text-center row justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม
|
||||
{{
|
||||
store.dataEvaluation.plannedPoint +
|
||||
store.dataEvaluation.rolePoint +
|
||||
store.dataEvaluation.specialPoint
|
||||
}}
|
||||
คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">{{ resultWork }}</div>
|
||||
<div class="row text-body2 text-weight-bold">
|
||||
<div class="col-12 text-center row justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม
|
||||
{{ store.indicatorScore }}
|
||||
คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">
|
||||
{{ store.indicatorScoreVal }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -291,14 +397,98 @@ onMounted(() => {
|
|||
|
||||
<Competency v-model:dataListCriteria="dataListCriteria" />
|
||||
|
||||
<Develop />
|
||||
<q-table
|
||||
flat
|
||||
dense
|
||||
bordered
|
||||
:rows="[
|
||||
{
|
||||
name: `สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม ${
|
||||
!store.dataProfile.posExecutiveName
|
||||
? store.competencyScore
|
||||
: store.excusiveCompetencyScore
|
||||
} คะแนน)`,
|
||||
value: store.competencyScoreVal,
|
||||
},
|
||||
]"
|
||||
:columns="[
|
||||
{
|
||||
name: 'name',
|
||||
field: 'name',
|
||||
label: 'name',
|
||||
style: 'font-size: 14px',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
field: 'value',
|
||||
label: 'value',
|
||||
style: 'font-size: 14px; font-weight: bold',
|
||||
},
|
||||
]"
|
||||
row-key="name"
|
||||
hide-header
|
||||
hide-bottom
|
||||
class="q-mt-xs q-mb-md"
|
||||
/>
|
||||
|
||||
<div class="row text-body2 text-weight-bold justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม
|
||||
{{ store.competencyScore }} คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">{{ store.competencyScoreVal }}</div>
|
||||
<div v-if="!store.dataProfile.posExecutiveName">
|
||||
<Develop />
|
||||
|
||||
<q-table
|
||||
flat
|
||||
dense
|
||||
bordered
|
||||
:rows="[
|
||||
{
|
||||
name: `ผลการประเมินการพัฒนาตนเอง (คะแนนเต็ม ${store.devScore} คะแนน)`,
|
||||
value: store.devScoreVal,
|
||||
},
|
||||
]"
|
||||
:columns="[
|
||||
{
|
||||
name: 'name',
|
||||
field: 'name',
|
||||
label: 'name',
|
||||
style: 'font-size: 14px',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
field: 'value',
|
||||
label: 'value',
|
||||
style: 'font-size: 14px; font-weight: bold',
|
||||
},
|
||||
]"
|
||||
row-key="name"
|
||||
hide-header
|
||||
hide-bottom
|
||||
class="q-mt-xs q-mb-md"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="!store.dataProfile.posExecutiveName"
|
||||
class="row text-body2 text-weight-bold"
|
||||
>
|
||||
<div class="col-12 text-center row justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง)
|
||||
(คะแนนเต็ม {{ store.competencyDevScore }} คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">
|
||||
{{ store.competencyDevScoreVal }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="row text-body2 text-weight-bold">
|
||||
<div class="col-12 text-center row justify-center">
|
||||
<span
|
||||
>สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ) (คะแนนเต็ม
|
||||
{{ store.competencyScore }} คะแนน)</span
|
||||
>
|
||||
<div class="text-primary q-pl-md">
|
||||
{{ store.competencyScoreVal }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-scroll-area>
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ import Dialog from "@/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue"
|
|||
import Dialog03 from "@/modules/08_KPI/components/Tab/Dialog/03_FormIndicatorSpecial.vue";
|
||||
import DialogEvaluate from "@/modules/08_KPI/components/Tab/DialogEvaluate/01_Indicator.vue";
|
||||
import DialogViewInfo from "@/modules/08_KPI/components/Tab/Dialog/DialogViewInfo.vue";
|
||||
import DialogProgress from "@/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue";
|
||||
import DialogProblem from "@/modules/08_KPI/components/Tab/Dialog/DialogCommentProblem.vue";
|
||||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKpiDataStore } from "@/modules/08_KPI/store";
|
||||
|
|
@ -171,14 +173,20 @@ function onDelete(id: string) {
|
|||
const modalProgress = ref<boolean>(false);
|
||||
const modalProblem = ref<boolean>(false);
|
||||
const type = ref<string>("");
|
||||
function openPopupProgress() {
|
||||
const idList = ref<string>("");
|
||||
function openPopupProgress(id: string) {
|
||||
modalProgress.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
type.value =
|
||||
numpage.value === 1 ? "plan" : numpage.value === 2 ? "role" : "special";
|
||||
idList.value = id;
|
||||
}
|
||||
|
||||
function openPopupProblem() {
|
||||
function openPopupProblem(id: string) {
|
||||
modalProblem.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
|
||||
type.value =
|
||||
numpage.value === 1 ? "plan" : numpage.value === 2 ? "role" : "special";
|
||||
idList.value = id;
|
||||
}
|
||||
|
||||
watch(
|
||||
|
|
@ -349,14 +357,15 @@ watch(
|
|||
</div>
|
||||
</q-td>
|
||||
<td>
|
||||
<!-- <div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'"> -->
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="note"
|
||||
color="blue-5"
|
||||
icon="mdi-developer-board"
|
||||
color="blue-6"
|
||||
size="12px"
|
||||
dense
|
||||
@click="openPopupProgress()"
|
||||
@click="openPopupProgress(props.row.id)"
|
||||
>
|
||||
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
|
||||
</q-btn>
|
||||
|
|
@ -367,44 +376,47 @@ watch(
|
|||
color="red-5"
|
||||
size="12px"
|
||||
dense
|
||||
:type="data ? 'plan' : data ? 'role' : 'special'"
|
||||
main="problem"
|
||||
@click="openPopupProblem()"
|
||||
@click="openPopupProblem(props.row.id)"
|
||||
>
|
||||
<q-tooltip>รายงานปัญหา</q-tooltip>
|
||||
</q-btn>
|
||||
<!-- </div> -->
|
||||
|
||||
<q-btn
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
size="12px"
|
||||
dense
|
||||
@click="onAdd(true, props.row.id)"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
size="12px"
|
||||
dense
|
||||
@click="onAdd(true, props.row.id)"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
size="12px"
|
||||
dense
|
||||
@click="onDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
size="12px"
|
||||
dense
|
||||
@click="onDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</td>
|
||||
</q-tr>
|
||||
</template>
|
||||
|
|
@ -438,7 +450,19 @@ watch(
|
|||
:isStatusEdit="isStatusEdit"
|
||||
:kpiUserPlannedId="kpiUserPlannedId"
|
||||
/>
|
||||
|
||||
<DialogProgress
|
||||
v-model:modal="modalProgress"
|
||||
v-model:type="type"
|
||||
:idList="idList"
|
||||
/>
|
||||
<DialogProblem
|
||||
v-model:modal="modalProblem"
|
||||
v-model:type="type"
|
||||
:idList="idList"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.custom-table2 {
|
||||
max-height: 64vh;
|
||||
|
|
|
|||
|
|
@ -197,6 +197,19 @@ function onEvaluate(type: string) {
|
|||
modalEvaluate.value = true;
|
||||
}
|
||||
|
||||
const modalProgress = ref<boolean>(false);
|
||||
const modalProblem = ref<boolean>(false);
|
||||
const type = ref<string>("");
|
||||
function openPopupProgress() {
|
||||
modalProgress.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
}
|
||||
|
||||
function openPopupProblem() {
|
||||
modalProblem.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
}
|
||||
|
||||
watch(
|
||||
() => store.dataEvaluation.capacityPoint,
|
||||
(newValue, oldValue) => {
|
||||
|
|
@ -345,30 +358,62 @@ onMounted(() => {
|
|||
{{ col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
@click.stop.pervent="onEdit(props.row, item.id)"
|
||||
<q-td>
|
||||
<div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="mdi-developer-board"
|
||||
color="blue-6"
|
||||
size="12px"
|
||||
dense
|
||||
@click="openPopupProgress()"
|
||||
>
|
||||
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="warning"
|
||||
color="red-5"
|
||||
size="12px"
|
||||
dense
|
||||
main="problem"
|
||||
@click="openPopupProblem()"
|
||||
>
|
||||
<q-tooltip>รายงานปัญหา</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
>
|
||||
<q-tooltip>แก้ไข </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onDelete(props.row.id, item.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
@click.stop.pervent="onEdit(props.row, item.id)"
|
||||
>
|
||||
<q-tooltip>แก้ไข </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onDelete(props.row.id, item.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -139,6 +139,19 @@ function onDelete(id: string) {
|
|||
});
|
||||
}
|
||||
|
||||
const modalProgress = ref<boolean>(false);
|
||||
const modalProblem = ref<boolean>(false);
|
||||
const type = ref<string>("");
|
||||
function openPopupProgress() {
|
||||
modalProgress.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
}
|
||||
|
||||
function openPopupProblem() {
|
||||
modalProblem.value = true;
|
||||
type.value = rows.value ? "plan" : rows.value ? "role" : "special";
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
getDevelop();
|
||||
});
|
||||
|
|
@ -273,30 +286,58 @@ onMounted(() => {
|
|||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
@click.stop.pervent="onEdit(props.row.id)"
|
||||
<q-td>
|
||||
<div v-if="store.dataEvaluation.evaluationStatus == 'APPROVE'">
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="mdi-developer-board"
|
||||
color="blue-6"
|
||||
size="12px"
|
||||
dense
|
||||
@click="openPopupProgress()"
|
||||
>
|
||||
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="warning"
|
||||
color="red-5"
|
||||
size="12px"
|
||||
dense
|
||||
main="problem"
|
||||
@click="openPopupProblem()"
|
||||
>
|
||||
<q-tooltip>รายงานปัญหา</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
|
||||
<div
|
||||
v-if="
|
||||
store.dataEvaluation.evaluationStatus === 'NEW' &&
|
||||
store.rolePerson === 'USER'
|
||||
"
|
||||
>
|
||||
<q-tooltip>แก้ไข </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="edit"
|
||||
color="edit"
|
||||
@click.stop.pervent="onEdit(props.row.id)"
|
||||
>
|
||||
<q-tooltip>แก้ไข </q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
flat
|
||||
round
|
||||
icon="delete"
|
||||
color="red"
|
||||
@click.stop.pervent="onDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล </q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue