From 22836149256ef07fd72ef4bf07cd584d40d96899 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 11 Feb 2025 17:08:35 +0700 Subject: [PATCH] report salary --- src/interface/main.ts | 2 + src/modules/21_report/interface/Main.ts | 19 +- .../21_report/views/05_reportSalary.vue | 626 +++++++++++++++++- 3 files changed, 639 insertions(+), 8 deletions(-) diff --git a/src/interface/main.ts b/src/interface/main.ts index 3d13a40da..f252ca4e8 100644 --- a/src/interface/main.ts +++ b/src/interface/main.ts @@ -52,6 +52,8 @@ interface DataStructureTree { totalRootPositionNextUse: number; totalRootPositionNextVacant: number; children: DataStructureTree[]; + orgRootCode: string; + orgRootShortName: string; } interface DataStrategy { diff --git a/src/modules/21_report/interface/Main.ts b/src/modules/21_report/interface/Main.ts index ef1950aad..bb4059f08 100644 --- a/src/modules/21_report/interface/Main.ts +++ b/src/modules/21_report/interface/Main.ts @@ -72,12 +72,18 @@ interface ProbationReportType { evaluate_date: Date; } -interface FileType{ - path:string - pathname:string - fileName:string - title:string +interface FileType { + path: string; + pathname: string; + fileName: string; + title: string; } + +interface DataOption { + id: string; + name: string; +} + export type { ListDataText, DataSurvey, @@ -85,5 +91,6 @@ export type { AppointTopicMain, AppointTopic, ProbationReportType, - FileType + FileType, + DataOption, }; diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue index 869d9ab47..8b4b69cac 100644 --- a/src/modules/21_report/views/05_reportSalary.vue +++ b/src/modules/21_report/views/05_reportSalary.vue @@ -1,7 +1,629 @@ - + - +