From d1eab09ee4d573012d571e996c33d27381f92220 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 15 Feb 2024 18:01:15 +0700 Subject: [PATCH] =?UTF-8?q?UI=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=9C=E0=B8=B1=E0=B8=87=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=8D=E0=B8=8A=E0=B8=B5=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/2_InvestigateFacts/Form.vue | 1 + .../components/SalaryChart/DialogFormMain.vue | 478 +++++++++++++++++- src/modules/13_salary/interface/index/Main.ts | 26 +- .../13_salary/interface/request/Main.ts | 7 + .../13_salary/interface/response/Main.ts | 13 +- src/modules/13_salary/router.ts | 2 +- src/modules/13_salary/views/salaryChart.vue | 330 +++++++++++- 7 files changed, 851 insertions(+), 6 deletions(-) create mode 100644 src/modules/13_salary/interface/request/Main.ts diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index cdac0c77f..711180deb 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -660,6 +660,7 @@ onMounted(async () => {
+
+ + + diff --git a/src/modules/13_salary/interface/index/Main.ts b/src/modules/13_salary/interface/index/Main.ts index a2567bc87..c755ce849 100644 --- a/src/modules/13_salary/interface/index/Main.ts +++ b/src/modules/13_salary/interface/index/Main.ts @@ -3,4 +3,28 @@ interface DataOption { name: string; } -export type { DataOption }; +interface NewPagination { + descending: boolean; + page: number; + rowsPerPage: number; + sortBy: string; +} + +interface ItemsMenu { + label: string; + icon: string; + color: string; + type: string; +} +interface ObjectSalaryRef { + salaryType: object | null; + posTyp: object | null; + posLevel: object | null; + date: object | null; + startDate: object | null; + endDate: object | null; + + [key: string]: any; +} + +export type { DataOption, NewPagination, ItemsMenu, ObjectSalaryRef }; diff --git a/src/modules/13_salary/interface/request/Main.ts b/src/modules/13_salary/interface/request/Main.ts new file mode 100644 index 000000000..7bbed3c09 --- /dev/null +++ b/src/modules/13_salary/interface/request/Main.ts @@ -0,0 +1,7 @@ +interface FormQuerySalary { + page: number; //*หน้า + pageSize: number; //*จำนวนแถวต่อหน้า + keyword: string; //keyword ค้นหา +} + +export type { FormQuerySalary }; diff --git a/src/modules/13_salary/interface/response/Main.ts b/src/modules/13_salary/interface/response/Main.ts index a2567bc87..3357b225f 100644 --- a/src/modules/13_salary/interface/response/Main.ts +++ b/src/modules/13_salary/interface/response/Main.ts @@ -2,5 +2,16 @@ interface DataOption { id: string; name: string; } +interface Salary { + id: string; + salaryType: string; + posType: string; + posLevel: string; + isActive: boolean; + date: Date; //ให้ไว้ ณ วันที่ + startDate: Date; + endDate: Date; + detail: string; +} -export type { DataOption }; +export type { Salary }; diff --git a/src/modules/13_salary/router.ts b/src/modules/13_salary/router.ts index d484610c6..f7af64dfd 100644 --- a/src/modules/13_salary/router.ts +++ b/src/modules/13_salary/router.ts @@ -13,7 +13,7 @@ export default [ }, }, { - path: "/salary/rate", + path: "/salary/rate/:id", name: "salaryRate", component: salaryRate, meta: { diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue index 773519059..98656271b 100644 --- a/src/modules/13_salary/views/salaryChart.vue +++ b/src/modules/13_salary/views/salaryChart.vue @@ -1,12 +1,340 @@ - +