From 4c3d5c8fb8c0ff1c91c21bad2dc9ba0ece70a495 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 27 Mar 2024 17:58:48 +0700 Subject: [PATCH] =?UTF-8?q?dasborad=20=20=E0=B9=80=E0=B8=A5=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/13_salary/api.salary.ts | 2 + .../SalaryEmployeeLists/Dashboard.vue | 178 +++++++++++------- .../SalaryEmployeeLists/DialogAddPerson.vue | 2 + .../interface/response/SalaryList.ts | 1 + .../13_salary/views/salaryEmployeeLists.vue | 6 +- 5 files changed, 119 insertions(+), 70 deletions(-) diff --git a/src/api/13_salary/api.salary.ts b/src/api/13_salary/api.salary.ts index 742d940ae..0c023d038 100644 --- a/src/api/13_salary/api.salary.ts +++ b/src/api/13_salary/api.salary.ts @@ -71,6 +71,8 @@ export default { salaryListPeriodProfileByIdEmp: (id: string) => `${salaryPeriodEmp}/profile/${id}`, + salaryDashboardEmp: `${salaryPeriodEmp}/summary/all`, + salaryPeriodStatusEmp: (type: string, periodId: string, rootId: string) => `${salaryPeriodEmp}/${type}/approve/${periodId}/${rootId}`, salaryPeriodStatusCommentEmp: ( diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue index 54fa80a1b..6906d91e2 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue @@ -1,10 +1,24 @@ diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue index 2c68cc393..b8c7f7d6f 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue @@ -137,9 +137,11 @@ function fetchListPerson() { * @param data ข้อมูลคนที่เพิ่ม */ function onClickAddPerson(data: DataPerson) { + data.rank = undefined; const body: DataPersonReq = { id: store.groupId, type: store.tabType, + ...data, }; diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts index 3b00b392d..a3fdc365e 100644 --- a/src/modules/13_salary/interface/response/SalaryList.ts +++ b/src/modules/13_salary/interface/response/SalaryList.ts @@ -74,6 +74,7 @@ interface DataPerson { prefix: string; root: string; rootId: string; + rank: string | undefined; } interface DataPeriod { diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue index 14076fefd..cc202d66f 100644 --- a/src/modules/13_salary/views/salaryEmployeeLists.vue +++ b/src/modules/13_salary/views/salaryEmployeeLists.vue @@ -437,7 +437,11 @@ onMounted(() => {
- +