From febf161d817b5cc842c6598e87a5723cafb30b6d Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 12 Mar 2024 16:23:23 +0700 Subject: [PATCH] =?UTF-8?q?=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=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88?= =?UTF-8?q?=E0=B8=B3=20=3D>=20=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A?= =?UTF-8?q?=E0=B8=B5=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogEmployeeChart.vue | 322 ++++++++++++++++++ .../salaryEmployeeChart/TabCriteria.vue | 6 + .../salaryEmployeeChart/TabStructure.vue | 309 +++++++++++++++++ .../interface/index/EmployeeChart.ts | 7 + .../interface/request/EmployeeChart.ts | 10 + src/modules/13_salary/router.ts | 12 + .../13_salary/store/SalaryEmployeeChart.ts | 13 + src/modules/13_salary/views/salaryChart.vue | 21 +- .../13_salary/views/salaryEmployeeChart.vue | 40 ++- .../13_salary/views/salaryEmployeeRate.vue | 168 +++++++++ 10 files changed, 896 insertions(+), 12 deletions(-) create mode 100644 src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue create mode 100644 src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue create mode 100644 src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue create mode 100644 src/modules/13_salary/interface/index/EmployeeChart.ts create mode 100644 src/modules/13_salary/interface/request/EmployeeChart.ts create mode 100644 src/modules/13_salary/store/SalaryEmployeeChart.ts create mode 100644 src/modules/13_salary/views/salaryEmployeeRate.vue diff --git a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue new file mode 100644 index 000000000..bb0f56d03 --- /dev/null +++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue @@ -0,0 +1,322 @@ + + + + diff --git a/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue b/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue new file mode 100644 index 000000000..e24c62a13 --- /dev/null +++ b/src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue @@ -0,0 +1,6 @@ + + + + diff --git a/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue b/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue new file mode 100644 index 000000000..3f57da830 --- /dev/null +++ b/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue @@ -0,0 +1,309 @@ + + + + diff --git a/src/modules/13_salary/interface/index/EmployeeChart.ts b/src/modules/13_salary/interface/index/EmployeeChart.ts new file mode 100644 index 000000000..12978b628 --- /dev/null +++ b/src/modules/13_salary/interface/index/EmployeeChart.ts @@ -0,0 +1,7 @@ +interface ObjectCharRef { + name: object | null; + group: object | null; + + [key: string]: any; +} +export type { ObjectCharRef }; diff --git a/src/modules/13_salary/interface/request/EmployeeChart.ts b/src/modules/13_salary/interface/request/EmployeeChart.ts new file mode 100644 index 000000000..5c4882412 --- /dev/null +++ b/src/modules/13_salary/interface/request/EmployeeChart.ts @@ -0,0 +1,10 @@ +interface FormDataChar { + name: string; //ชื่อผังบัญชีโครงสร้างอัตราค่าจ้างลูกจ้าง + group: string; //*กลุ่มบัญชีค่าจ้าง + isActive: boolean; //*สถานะการใช้งาน + date: Date | null; //ให้ไว้ ณ วันที่ + startDate: Date | null; //วันที่มีผลบังคับใช้ + endDate: Date | null; //วันที่สิ้นสุดบังคับใช้ + details: string; //คำอธิบาย +} +export type { FormDataChar }; diff --git a/src/modules/13_salary/router.ts b/src/modules/13_salary/router.ts index 06937a91e..f9a0fa041 100644 --- a/src/modules/13_salary/router.ts +++ b/src/modules/13_salary/router.ts @@ -1,6 +1,8 @@ const salaryChart = () => import("@/modules/13_salary/views/salaryChart.vue"); const salaryEmployeeChart = () => import("@/modules/13_salary/views/salaryEmployeeChart.vue"); +const salaryEmployeeRate = () => + import("@/modules/13_salary/views/salaryEmployeeRate.vue"); const salaryRate = () => import("@/modules/13_salary/views/salaryRate.vue"); const salaryRound = () => import("@/modules/13_salary/views/salaryRound.vue"); const salaryLists = () => import("@/modules/13_salary/views/salaryLists.vue"); @@ -28,6 +30,16 @@ export default [ Role: "salary", }, }, + { + path: "/salary-employee/rate/:id", + name: "salaryEmployeeRate", + component: salaryEmployeeRate, + meta: { + Auth: true, + Key: [1.1], + Role: "salary", + }, + }, { path: "/salary/rate/:id", name: "salaryRate", diff --git a/src/modules/13_salary/store/SalaryEmployeeChart.ts b/src/modules/13_salary/store/SalaryEmployeeChart.ts new file mode 100644 index 000000000..ea3947e30 --- /dev/null +++ b/src/modules/13_salary/store/SalaryEmployeeChart.ts @@ -0,0 +1,13 @@ +import { defineStore } from "pinia"; + +import { ref } from "vue"; + +export const useSalaryEmployeeChartDataStore = defineStore( + "salaryEmployeeChart", + () => { + const mainTab = ref("structure"); + return { + mainTab, + }; + } +); diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue index 176711e1d..9ce96f301 100644 --- a/src/modules/13_salary/views/salaryChart.vue +++ b/src/modules/13_salary/views/salaryChart.vue @@ -296,18 +296,17 @@ async function filterFn(page: number) {
- ประเภทตำแหน่ง - ระดับตำแหน่ง - - -
+ ประเภทตำแหน่ง + ระดับตำแหน่ง +
- {{ props.row.posType }} - {{ props.row.isSpecial ? `${props.row.posLevel} (ฉ)` : `${props.row.posLevel}` }} - - - -
+ {{ props.row.posType }} + {{ + props.row.isSpecial + ? `${props.row.posLevel} (ฉ)` + : `${props.row.posLevel}` + }} +
{{ diff --git a/src/modules/13_salary/views/salaryEmployeeChart.vue b/src/modules/13_salary/views/salaryEmployeeChart.vue index 31dbc5a64..add4984af 100644 --- a/src/modules/13_salary/views/salaryEmployeeChart.vue +++ b/src/modules/13_salary/views/salaryEmployeeChart.vue @@ -1,3 +1,41 @@ + + diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue new file mode 100644 index 000000000..8e81fac1c --- /dev/null +++ b/src/modules/13_salary/views/salaryEmployeeRate.vue @@ -0,0 +1,168 @@ + + + +