From a99119660b0d0c908e3440ad9b11ed556bd1b86e Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 9 May 2024 18:09:43 +0700 Subject: [PATCH] updated kpi --- src/api/KPI/api.kpis.ts | 3 +- .../08_KPI/components/Tab/01_Assessment.vue | 274 +------------ .../components/Tab/Dialog/DialogDevelop.vue | 8 +- .../components/Tab/Topic/03_Develop.vue | 376 ++++++++++++++++++ src/modules/08_KPI/views/form.vue | 50 ++- 5 files changed, 407 insertions(+), 304 deletions(-) create mode 100644 src/modules/08_KPI/components/Tab/Topic/03_Develop.vue diff --git a/src/api/KPI/api.kpis.ts b/src/api/KPI/api.kpis.ts index eaf5e66..27c47d2 100644 --- a/src/api/KPI/api.kpis.ts +++ b/src/api/KPI/api.kpis.ts @@ -35,6 +35,7 @@ export default { Kpiorg, kpiEvaluationCheck: `${kpiEvaluation}/check`, kpiSendToStatus: (id: string) => `${kpiEvaluation}/status/${id}`, + kpiReqEdit: (id: string) => `${kpiEvaluation}/edit/${id}`, /**ประเมิน*/ - kpiAchievementDevelop:`${kpiAchievement}/development` + kpiAchievementDevelop: `${kpiAchievement}/development`, }; diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index 7c4bb1a..1be8d5a 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -4,14 +4,13 @@ import { useQuasar, type QTableProps } from "quasar"; import { useRoute } from "vue-router"; import DialogListCriteria from "@/modules/08_KPI/components/Tab/Dialog/DialogListCriteria.vue"; -import DialogDevelop from "@/modules/08_KPI/components/Tab/Dialog/DialogDevelop.vue"; -import DialogEvalutionDevelop from "@/modules/08_KPI/components/Tab/DialogEvaluate/03_DialogEvalutionDevelop.vue"; import config from "@/app.config"; import http from "@/plugins/http"; import Work from "@/modules/08_KPI/components/Tab/Topic/01_Indicator.vue"; import Competency from "@/modules/08_KPI/components/Tab/Topic/02_Competency.vue"; +import Develop from "@/modules/08_KPI/components/Tab/Topic/03_Develop.vue"; import { useCounterMixin } from "@/stores/mixin"; import { useKpiDataStore } from "@/modules/08_KPI/store"; @@ -24,14 +23,9 @@ const indicatorWeightTotal = defineModel("indicatorWeightTotal", { }); const dataListCriteria = ref([]); -const rows = ref([]); -const modalEvaluate = ref(false); const modalCriteria = ref(false); -const modalDevelop = ref(false); -const idEditDevelop = ref(""); const $q = useQuasar(); const route = useRoute(); -const isReadonly = (route.name === "KPIEditEvaluator" ? true : false); const { hideLoader, messageError, @@ -52,68 +46,6 @@ const totalResults1 = ref(0); const totalResults2 = ref(0); const totalResults3 = ref(0); // const resultWork = ref(0); -const formData = reactive({ - isDevelopment70: false, - isDevelopment20: false, - isDevelopment10: false, -}); -const columns = ref([ - { - name: "name", - align: "left", - label: "ชื่อเรื่อง / เนื้อเรื่อง / หัวข้อการพัฒนา", - sortable: true, - field: "name", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "develop", - align: "left", - label: "วิธีการพัฒนา", - sortable: true, - field: "develop", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "target", - align: "left", - label: "เป้าหมายการนำไปพัฒนางาน", - sortable: true, - field: "target", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "achievement", - align: "left", - label: "เกณฑ์การประเมินผลการพัฒนา", - sortable: true, - field: "achievement", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "summary", - align: "left", - label: "ผลการประเมิน", - sortable: true, - field: "summary", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, -]); const weightPlanned = ref(0); const weightRole = ref(0); @@ -248,51 +180,11 @@ watch( } ); -function onAdd() { - modalDevelop.value = true; -} - -function onEdit(id: string) { - modalDevelop.value = true; - idEditDevelop.value = id; -} - -function getDevelop() { - http - .get(config.API.kpiAchievementDevelop + `?id=${evaluationId.value}`) - .then((res) => { - const data = res.data.result; - rows.value = data; - }); -} -function onDelete(id: string) { - dialogRemove($q, () => { - showLoader(); - http - .delete(config.API.kpiAchievementDevelop + `/${id}`) - .then((res) => { - success($q, "ลบข้อมูลสำเร็จ"); - getAll(); - }) - .catch((e) => { - messageError($q, e); - }) - .finally(() => { - hideLoader(); - }); - }); -} - async function getAll() { await getCriteria(); await fetchListPlanned(); await fetchListRole(); await fetchAssigned(); - await getDevelop(); -} - -function onEvaluate() { - modalEvaluate.value = true; } onMounted(() => { @@ -300,7 +192,6 @@ onMounted(() => { fetchListPlanned(); fetchListRole(); fetchAssigned(); - getDevelop(); setTimeout(() => { hideLoader(); }, 1000); @@ -400,156 +291,7 @@ onMounted(() => { - - -
-
- การพัฒนาตนเอง - - เพิ่มข้อมูล - -
- - - - ประเมิน - -
- - - - - - - - +
{ v-model:modal="modalCriteria" v-model:dataListCriteria="dataListCriteria" /> - - - - diff --git a/src/modules/08_KPI/views/form.vue b/src/modules/08_KPI/views/form.vue index 78d8e11..968bf91 100644 --- a/src/modules/08_KPI/views/form.vue +++ b/src/modules/08_KPI/views/form.vue @@ -273,14 +273,14 @@ function onSubmitScore() { }); } -async function clearScore() { - modalScore.value = false; - plannedPoint.value = ""; - rolePoint.value = ""; - specialPoint.value = ""; - capacityPoint.value = ""; - getAll(); -} +// async function clearScore() { +// modalScore.value = false; +// plannedPoint.value = ""; +// rolePoint.value = ""; +// specialPoint.value = ""; +// capacityPoint.value = ""; +// getAll(); +// } async function getAll() { await fetchEvaluation(); @@ -320,25 +320,21 @@ function requireEdit() { $q, () => { if (id.value) { - // showLoader(); - // http - // .put(config.API.kpiEvaluationCheck + `/${id.value}`, { - // evaluatorId: evaluatorId.value ? evaluatorId.value.id : null, - // commanderId: commanderId.value ? commanderId.value.id : null, - // commanderHighId: commanderHighId.value - // ? commanderHighId.value.id - // : null, - // }) - // .then((res) => { - // success($q, "บันทึกสำเร็จ"); - // close(); - // }) - // .catch((e) => { - // messageError($q, e); - // }) - // .finally(() => { - // hideLoader(); - // }); + showLoader(); + http + .put(config.API.kpiReqEdit(id.value), { + status: "EVALUATOR", + }) + .then((res) => { + success($q, "ขอแก้ไขสำเร็จ"); + close(); + }) + .catch((e) => { + messageError($q, e); + }) + .finally(() => { + hideLoader(); + }); } }, "ยืนยันการขอแก้ไขข้อตกลง",