From e100ac0ec3daccd144de8669ee72539cd9229374 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 9 May 2024 14:44:51 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=8A=E0=B8=B5?= =?UTF-8?q?=E0=B9=89=E0=B8=A7=E0=B8=B1=E0=B8=94=20=3D>=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=87=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=A1=E0=B8=AD=E0=B8=9A=E0=B8=AB?= =?UTF-8?q?=E0=B8=A1=E0=B8=B2=E0=B8=A2=20interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Indicators/Assignment/DetailView.vue | 11 ++++++---- .../01_metadataNew/interface/index/Main.ts | 17 +++++++++++++++- .../01_metadataNew/interface/request/Main.ts | 15 +++++++++++--- .../01_metadataNew/interface/response/Main.ts | 20 ++++++++++++++++++- .../01_metadataNew/views/Assignment.vue | 12 +++++++---- 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue b/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue index 62a63bca6..502a175ec 100644 --- a/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue +++ b/src/modules/01_metadataNew/components/Indicators/Assignment/DetailView.vue @@ -5,11 +5,14 @@ import { useRouter, useRoute } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import { useCounterMixin } from "@/stores/mixin"; - +/** importType*/ import type { FormDataRole } from "@/modules/01_metadataNew/interface/request/Main"; import type { DataOption } from "@/modules/01_metadataNew/interface/index/Main"; +/** importStore*/ +import { useCounterMixin } from "@/stores/mixin"; + +/** use*/ const $q = useQuasar(); const route = useRoute(); const router = useRouter(); @@ -27,11 +30,10 @@ const form = reactive({ includingName: "", //ชื่อตัวชี้วัด target: "", //ค่าเป้าหมาย unit: "", //หน่วยนับ - weight: "", //น้ำหนัก + weight: null, //น้ำหนัก meaning: "", //นิยามหรือความหมาย formula: "", //สูตรคำนวณ documentInfoEvidence: "", //ข้อมูลเอกสารหลักฐาน - node: null, nodeId: null, orgRevisionId: null, @@ -65,6 +67,7 @@ function fetchspecialByid(id: string) { http .get(config.API.kpiSpecial + `/${id}`) .then((res) => { + console.log(res); const data = res.data.result; form.year = data.year; form.round = data.period; diff --git a/src/modules/01_metadataNew/interface/index/Main.ts b/src/modules/01_metadataNew/interface/index/Main.ts index 5c185ec88..0d2392149 100644 --- a/src/modules/01_metadataNew/interface/index/Main.ts +++ b/src/modules/01_metadataNew/interface/index/Main.ts @@ -19,4 +19,19 @@ interface ItemsMenu { color: string; } -export type { Pagination, DataOption, NewPagination, ItemsMenu }; +interface DataAssignment { + createdAt: string; + id: string; + including: string; + includingName: string; + period: string; + year: string; +} + +export type { + Pagination, + DataOption, + NewPagination, + ItemsMenu, + DataAssignment, +}; diff --git a/src/modules/01_metadataNew/interface/request/Main.ts b/src/modules/01_metadataNew/interface/request/Main.ts index 5cb7bdbfd..e2f30f210 100644 --- a/src/modules/01_metadataNew/interface/request/Main.ts +++ b/src/modules/01_metadataNew/interface/request/Main.ts @@ -21,21 +21,21 @@ interface FormListMainByRole { } interface FormDataRole { position: string; - year: number | null; + year: number | null | string; round: string; org: string; including: string; includingName: string; target: string; unit: string; - weight: string; + weight: number | null; meaning: string; formula: string; documentInfoEvidence: string; node: number | null; nodeId: string | null; orgRevisionId: string | null; - date: any | null; + date: [null, null]; } interface FormCompetency { @@ -56,6 +56,14 @@ interface FormQueryCapacity { keyword: string; } +interface FormFilterAssignment { + keyword: string; + period: string; + year: number | string | null; + pageSize: number; + page: number; +} + export type { DataSumCalendarObject, DataListsObject, @@ -63,4 +71,5 @@ export type { FormDataRole, FormCompetency, FormQueryCapacity, + FormFilterAssignment, }; diff --git a/src/modules/01_metadataNew/interface/response/Main.ts b/src/modules/01_metadataNew/interface/response/Main.ts index 2d8cea4d2..56a44e963 100644 --- a/src/modules/01_metadataNew/interface/response/Main.ts +++ b/src/modules/01_metadataNew/interface/response/Main.ts @@ -40,4 +40,22 @@ interface ResEvaluator { type: string; } -export type { ResRound, ResDataCapacity, ResEvaluator }; +interface ResAssignment { + data: { + result: { + data: [ + { + createdAt: string; + id: string; + including: string; + includingName: string; + period: string; + year: string; + } + ]; + total: number; + }; + }; +} + +export type { ResRound, ResDataCapacity, ResEvaluator, ResAssignment }; diff --git a/src/modules/01_metadataNew/views/Assignment.vue b/src/modules/01_metadataNew/views/Assignment.vue index 4912a42ed..6c861b8e7 100644 --- a/src/modules/01_metadataNew/views/Assignment.vue +++ b/src/modules/01_metadataNew/views/Assignment.vue @@ -5,10 +5,14 @@ import { useQuasar, type QTableProps } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; +/** importType*/ import type { DataOption, NewPagination, + DataAssignment, } from "@/modules/01_metadataNew/interface/index/Main"; +import type { FormFilterAssignment } from "@/modules/01_metadataNew/interface/request/Main"; +import type { ResAssignment } from "@/modules/01_metadataNew/interface/response/Main"; /** importStore*/ import { useCounterMixin } from "@/stores/mixin"; @@ -39,16 +43,16 @@ const columns = ref([ style: "font-size: 14px", }, ]); +const visibleColumns = ref(["including", "includingName"]); /** Option รอบการประเมิน*/ const roundOp = ref([ { id: "APR", name: "รอบเมษายน" }, { id: "OCT", name: "รอบตุลาคม" }, ]); -const visibleColumns = ref(["including", "includingName"]); -const rows = ref([]); +const rows = ref([]); -const formFilter = reactive({ +const formFilter = reactive({ keyword: "", period: "", year: new Date().getFullYear(), @@ -63,7 +67,7 @@ function fetchList() { formFilter.year = formFilter.year ? formFilter.year.toString() : null; http .post(config.API.kpiSpecial + `/search`, formFilter) - .then((res) => { + .then((res: ResAssignment) => { maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); totalList.value = res.data.result.total; rows.value = res.data.result.data;