+
{{ col.value ?? "-" }}
+
+ รายละเอียดแผนพัฒนาการปฏิบัติราชการรายบุคคล
+
@@ -409,20 +409,8 @@ onMounted(() => {
-
-
-
-
+
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index f2832be07..330200177 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -8,7 +8,10 @@ import config from "@/app.config";
* importType
*/
import type { QTableProps } from "quasar";
-import type { ResResults } from "@/modules/14_KPI/interface/response/Main";
+import type {
+ ResResults,
+ ResRound,
+} from "@/modules/14_KPI/interface/response/Main";
import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
/**
@@ -203,6 +206,9 @@ function onAnnounce() {
const year = ref
(new Date().getFullYear());
const roundOp = ref([]);
+/**
+ * function fetch รอบการประเมิน
+ */
function fetchRoundOption() {
showLoader();
http
@@ -213,7 +219,7 @@ function fetchRoundOption() {
.then(async (res) => {
const data = await res.data.result.data;
if (res.data.result.data.length > 0) {
- const list = await data.map((e: any) => ({
+ const list = await data.map((e: ResRound) => ({
id: e.id,
name:
e.durationKPI === "OCT"
@@ -252,12 +258,12 @@ function onSearchData() {
porps.fetchData();
}
-function clearYear() {
- year.value = null;
- store.formQuery.round = "";
- roundOp.value = [];
- porps.fetchData();
-}
+// function clearYear() {
+// year.value = null;
+// store.formQuery.round = "";
+// roundOp.value = [];
+// porps.fetchData();
+// }
/**
* ทำงานเมื่อมีการเปลี่ยนแถวต่อหน้า
*/
@@ -267,6 +273,7 @@ watch(pagination, () => {
});
onMounted(() => {
+ store.formQuery.round = "";
fetchRoundOption();
});
@@ -296,8 +303,6 @@ onMounted(() => {
hide-bottom-space
:model-value="!!year ? year + 543 : null"
:label="`${'ปีงบประมาณ'}`"
- clearable
- @clear="clearYear"
>
{
map-options
@update:model-value="changRound"
/>
-
-
+
{{ col.value ?? "-" }}
diff --git a/src/modules/14_KPI/interface/index/Main.ts b/src/modules/14_KPI/interface/index/Main.ts
index 26eafa9bd..d321c73b4 100644
--- a/src/modules/14_KPI/interface/index/Main.ts
+++ b/src/modules/14_KPI/interface/index/Main.ts
@@ -2,6 +2,10 @@ interface DataOption {
id: string;
name: string;
}
+interface OptionCheckbox {
+ label: string;
+ value: string;
+}
interface ItemsTab {
label: string;
name: string;
@@ -64,6 +68,7 @@ interface FormData {
email: string;
qualification: string;
}
+interface DataCapacity {}
export type {
DataOption,
@@ -74,4 +79,6 @@ export type {
tableType,
FormData,
ItemsTab,
+ OptionCheckbox,
+ DataCapacity,
};
diff --git a/src/modules/14_KPI/interface/response/index.ts b/src/modules/14_KPI/interface/response/index.ts
index c93bb00ff..f396e4c5b 100644
--- a/src/modules/14_KPI/interface/response/index.ts
+++ b/src/modules/14_KPI/interface/response/index.ts
@@ -41,4 +41,19 @@ interface ResEvaluatorAssessor {
profileId: string;
}
-export type { ResEvaluator, ResRound, ResEvaluatorAssessor };
+interface ResDevelopment {
+ developmentName: string;
+ durationKPI: string;
+ firstname: string;
+ id: string;
+ kpiPeriodId: string;
+ lastname: string;
+ organization: string;
+ posLevelName: string;
+ posTypeName: string;
+ position: string;
+ prefix: string;
+ root: string;
+}
+
+export type { ResEvaluator, ResRound, ResEvaluatorAssessor, ResDevelopment };
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index 7710f6cc6..7974e1e29 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -185,9 +185,6 @@ function fetchReport() {
.catch((err) => {
messageError($q, err);
hideLoader();
- })
- .finally(() => {
- persanalId.value = "";
});
}
@@ -236,13 +233,19 @@ function changOption(val: string) {
val === "KPI8" ||
val === "KPI9"
) {
- persanalId.value = "";
- if (round.value !== "" && organization.value !== "") {
+ persanalId.value = val === "KPI8" ? persanalId.value : "";
+ organization.value = val === "KPI8" ? "" : organization.value;
+ if (round.value && organization.value) {
+ fetchReport();
+ } else if (round.value && persanalId.value) {
fetchReport();
}
} else {
round.value = "";
organization.value = "";
+ if (persanalId.value) {
+ fetchReport();
+ }
}
}
diff --git a/src/modules/14_KPI/views/resultsMain.vue b/src/modules/14_KPI/views/resultsMain.vue
index 8251a4915..97b30a3e5 100644
--- a/src/modules/14_KPI/views/resultsMain.vue
+++ b/src/modules/14_KPI/views/resultsMain.vue
@@ -59,22 +59,8 @@ function fetcDataList() {
})
.then((res) => {
const data = res.data.result.data;
- for (let index = 0; index < data.length; index++) {
- const element = data[index];
- dataList.value.push({
- ...element,
- root: "สำนักงานเขตพระนคร",
- rootId: "e8493cd1-d371-402e-add6-566e68d5d1b3",
- rootShortName: "ขพน.",
- position: "นักวิเคราะห์นโยบายและแผน",
- posTypeId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08071",
- posTypeName: "วิชาการ",
- posLevelId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08562",
- posLevelName: "ปฏิบัติการ",
- organization: "ฝ่ายทะเบียน สำนักงานเขตพระนคร",
- });
- }
- // dataList.value = data.data;
+
+ dataList.value = data;
total.value = data.total;
maxPage.value = Math.ceil(total.value / pageSize.value);
@@ -87,14 +73,14 @@ function fetcDataList() {
});
}
-/**
- * ทำงานเมื่อมีการเปลี่ยน Tab
- */
-watch(tab, (t) => {
- page.value = 1;
- keyword.value = "";
- t == "KP7" || t == "COMPLETE" ? fetcDataList() : "";
-});
+// /**
+// * ทำงานเมื่อมีการเปลี่ยน Tab
+// */
+// watch(tab, (t) => {
+// page.value = 1;
+// keyword.value = "";
+// t == "KP7" || t == "COMPLETE" ? fetcDataList() : "";
+// });
/**
* ทำงานเมื่อมีการเปลี่ยนแถวต่อหน้า
@@ -107,7 +93,7 @@ watch(pageSize, () => {
* HooK
*/
onMounted(() => {
- fetcDataList();
+ // fetcDataList();
});