From 18ad7b102e10f8be04fe9738ab2a389096fe24a1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 16 Feb 2024 11:12:16 +0700 Subject: [PATCH] UI Salary --- .../components/SalaryChart/DialogFormRate.vue | 253 +++++++++++++- src/modules/13_salary/interface/index/Main.ts | 20 +- .../13_salary/interface/response/Main.ts | 14 +- src/modules/13_salary/views/salaryChart.vue | 10 +- src/modules/13_salary/views/salaryRate.vue | 323 +++++++++++++++++- 5 files changed, 612 insertions(+), 8 deletions(-) diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue index 33ab9e8c8..3a6314200 100644 --- a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue +++ b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue @@ -1,5 +1,254 @@ - + + + diff --git a/src/modules/13_salary/interface/index/Main.ts b/src/modules/13_salary/interface/index/Main.ts index c755ce849..a716aa852 100644 --- a/src/modules/13_salary/interface/index/Main.ts +++ b/src/modules/13_salary/interface/index/Main.ts @@ -27,4 +27,22 @@ interface ObjectSalaryRef { [key: string]: any; } -export type { DataOption, NewPagination, ItemsMenu, ObjectSalaryRef }; +interface ObjectSalaryRateRef { + salary: object | null; + salaryHalf: object | null; + salaryHalfSpecial: object | null; + salaryFull: object | null; + salaryFullSpecial: object | null; + salaryFullHalf: object | null; + salaryFullHalfSpecial: object | null; + + [key: string]: any; +} + +export type { + DataOption, + NewPagination, + ItemsMenu, + ObjectSalaryRef, + ObjectSalaryRateRef, +}; diff --git a/src/modules/13_salary/interface/response/Main.ts b/src/modules/13_salary/interface/response/Main.ts index 3357b225f..dd83d7ac2 100644 --- a/src/modules/13_salary/interface/response/Main.ts +++ b/src/modules/13_salary/interface/response/Main.ts @@ -14,4 +14,16 @@ interface Salary { detail: string; } -export type { Salary }; +interface SalaryRate { + id: string; + salary: number; + salaryHalf: number; + salaryHalfSpecial: number; + salaryFull: number; + salaryFullSpecial: number; + salaryFullHalf: number; + salaryFullHalfSpecial: number; + isNext: boolean; +} + +export type { Salary, SalaryRate }; diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue index 98656271b..581ad1b38 100644 --- a/src/modules/13_salary/views/salaryChart.vue +++ b/src/modules/13_salary/views/salaryChart.vue @@ -1,5 +1,5 @@