From 6c10587139e1fd133311e04ce94b1a48369b71b9 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 8 May 2024 08:06:53 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9F?= =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B9=8C=E0=B8=A1=20kpi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../08_KPI/components/Tab/01_Assessment.vue | 8 +++++ .../Tab/Dialog/04_FormCompetency.vue | 19 ++++++------ src/modules/08_KPI/components/Tab/TabMain.vue | 30 +++++++++++-------- .../components/Tab/Topic/01_Indicator.vue | 4 +-- .../components/Tab/Topic/02_Competency.vue | 16 +++------- src/modules/08_KPI/views/form.vue | 4 +-- 6 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index 97d2620..4dd7451 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -269,6 +269,14 @@ onMounted(() => { v-model:dataListCriteria="dataListCriteria" v-model:competencyScore="competencyScore" /> + +
+ สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม + {{ store.dataEvaluation.capacityPoint }} คะแนน) +
{{ competencyScore }}
+
diff --git a/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue b/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue index 8fcd607..b06391e 100644 --- a/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue +++ b/src/modules/08_KPI/components/Tab/Dialog/04_FormCompetency.vue @@ -24,7 +24,7 @@ const $q = useQuasar(); const store = useKpiDataStore(); const expectedLevel = ref(); -const weight = ref(null); +const weight = ref(100); const mixin = useCounterMixin(); const { showLoader, @@ -123,7 +123,7 @@ function closeDialog() { formDetail.definition = ""; formDetail.criteria = ""; idProps.value = null; - weight.value = null; + // weight.value = null; expectedLevel.value = null; dataListCapacityDetails.value = []; @@ -375,6 +375,7 @@ watch(
น้ำหนัก (ร้อยละ)
ระดับที่คาดหวัง
-
+
-
+
@@ -428,8 +427,8 @@ watch(
ไม่พบข้อมูลสมรรถนะ
diff --git a/src/modules/08_KPI/components/Tab/TabMain.vue b/src/modules/08_KPI/components/Tab/TabMain.vue index 431b664..d559d84 100644 --- a/src/modules/08_KPI/components/Tab/TabMain.vue +++ b/src/modules/08_KPI/components/Tab/TabMain.vue @@ -11,7 +11,8 @@ import File from "@/modules/08_KPI/components/Tab/05_File.vue"; const store = useKpiDataStore(); const route = useRoute(); -const isReadonly = (route.name === "KPIEditEvaluator" ? true : false); +const isReadonly = ref(route.name === "KPIEditEvaluator" ? true : false); +const step = ref(1); // 1 = จัดทำข้อตกลง, 2 = รายงานความก้าวหน้า, 3 = รายงานผลสำเร็จของงาน const indicatorScore = defineModel("indicatorScore", { type: Number, default: 0, @@ -23,20 +24,24 @@ const competencyScore = defineModel("competencyScore", { const itemsTab = ref([ { name: "1", - label: "ผู้ขอรับการประเมิน", + label: "จัดทำแบบฟอร์มการประเมิน", }, { name: "2", - label: "ผู้ประเมิน", + label: "รายงานความก้าวหน้า", }, { name: "3", - label: "ผู้บังคับบัญชาเหนือขึ้นไป", - }, - { - name: "4", - label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง", + label: "รายงานผลสำเร็จของงาน", }, + // { + // name: "3", + // label: "ผู้บังคับบัญชาเหนือขึ้นไป", + // }, + // { + // name: "4", + // label: "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง", + // }, { name: "5", label: "ไฟล์เอกสาร", @@ -63,14 +68,15 @@ const splitterModel = ref(12); :icon="tab.icon" :label="tab.label" /> --> - - - + + + + diff --git a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue index 8969aeb..1407b71 100644 --- a/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue +++ b/src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue @@ -204,7 +204,7 @@ watch( เพิ่มข้อมูล -
+
diff --git a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue index ec1f213..65f4374 100644 --- a/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue +++ b/src/modules/08_KPI/components/Tab/Topic/02_Competency.vue @@ -115,7 +115,7 @@ function onAdd(type: string) { const rows = ref([]); const lists = ref([]); -const resultEvaluation = ref(0); +// const resultEvaluation = ref(0); function getData(type: string) { http @@ -161,7 +161,7 @@ function getData(type: string) { weightAvg != 0 ? (resultAvg / weightAvg) * store.dataEvaluation.capacityPoint : 0; - resultEvaluation.value = sum.toFixed(2); + // resultEvaluation.value = sum.toFixed(2); competencyScore.value = sum; } }); @@ -239,7 +239,7 @@ onMounted(() => { - { @click="onEvaluate(item.id)" > ประเมิน - + --> @@ -359,14 +359,6 @@ onMounted(() => { v-model:dataListCriteria="dataListCriteria" :get-data="getData" /> - -
- สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม - {{ store.dataEvaluation.capacityPoint }} คะแนน) -
{{ resultEvaluation }}
-