From 74b028c68e3cfccf2db52c257b455b721bb7c505 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 13 Dec 2024 15:24:00 +0700 Subject: [PATCH] =?UTF-8?q?UI=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=AA=E0=B8=A3=E0=B8=B8=E0=B8=9B=E0=B8=88?= =?UTF-8?q?=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=99=E0=B8=9C=E0=B8=A5=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/12_evaluatePersonal/api.evaluate.ts | 1 + .../11_discipline/store/ComplaintsStore.ts | 2 +- .../interface/index/Main.ts | 32 +++ .../12_evaluatePersonal/views/MainPage.vue | 200 +++++++++++++++++- 4 files changed, 232 insertions(+), 3 deletions(-) diff --git a/src/api/12_evaluatePersonal/api.evaluate.ts b/src/api/12_evaluatePersonal/api.evaluate.ts index 493c62a2c..2311451a8 100644 --- a/src/api/12_evaluatePersonal/api.evaluate.ts +++ b/src/api/12_evaluatePersonal/api.evaluate.ts @@ -46,4 +46,5 @@ export default { `${evaluation}/choose-meetings/${id}`, evaluationListData: (id: string) => `${evaluation}/director-meeting/${id}`, + evaluationReport:`${evaluation}/report` }; diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts index 68dd4d913..7993b203c 100644 --- a/src/modules/11_discipline/store/ComplaintsStore.ts +++ b/src/modules/11_discipline/store/ComplaintsStore.ts @@ -9,7 +9,7 @@ import type { DataList, DataListRow, ocListType, -} from "@/modules/11_discipline/interface/response/complaint"; +} from "@/modules/11_discipline/interface/response/Complaint"; import type { QTableProps } from "quasar"; diff --git a/src/modules/12_evaluatePersonal/interface/index/Main.ts b/src/modules/12_evaluatePersonal/interface/index/Main.ts index 688cb1632..a3c2a3b0d 100644 --- a/src/modules/12_evaluatePersonal/interface/index/Main.ts +++ b/src/modules/12_evaluatePersonal/interface/index/Main.ts @@ -93,6 +93,37 @@ interface Pagination { rowsPerPage: number; } +interface ResOrg { + labelName: string; + orgCode: string; + orgLevel: number; + orgName: string; + orgRevisionId: string; + orgRootName: string; + orgTreeCode: string; + orgTreeFax: string; + orgTreeId: string; + orgTreeName: string; + orgTreeOrder: number; + orgTreePhoneEx: string; + orgTreePhoneIn: string; + orgTreeRank: string; + orgTreeRankSub: string; + orgTreeShortName: string; + responsibility: string; + totalPosition: number; + totalPositionCurrentUse: number; + totalPositionCurrentVacant: number; + totalPositionNextUse: number; + totalPositionNextVacant: number; + totalRootPosition: number; + totalRootPositionCurrentUse: number; + totalRootPositionCurrentVacant: number; + totalRootPositionNextUse: number; + totalRootPositionNextVacant: number; + children: ResOrg[]; +} + export type { DataOption, InvestigatefactsDataRowType, @@ -106,4 +137,5 @@ export type { OptionStatus, Meeting, Pagination, + ResOrg }; diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue index 05d1d6692..c808baac6 100644 --- a/src/modules/12_evaluatePersonal/views/MainPage.vue +++ b/src/modules/12_evaluatePersonal/views/MainPage.vue @@ -1,26 +1,42 @@