From 24302d01d725f2c6e8dfe26d46d6f9775875c193 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 5 Mar 2024 15:28:53 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/13_salary/components/SalaryChart/DialogFormMain.vue | 1 + src/modules/13_salary/views/salaryChart.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue index e2766dfc3..6f1c9ad3d 100644 --- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue +++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue @@ -143,6 +143,7 @@ async function fetchSalaryDetail(id: string) { formData.startDate = data.startDate; formData.endDate = data.endDate; formData.details = data.details; + formData.isSpecial = data.isSpecial; }) .catch((err) => { messageError($q, err); diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue index 7871a46a3..0baa78b90 100644 --- a/src/modules/13_salary/views/salaryChart.vue +++ b/src/modules/13_salary/views/salaryChart.vue @@ -159,6 +159,7 @@ async function fetchListSalaly() { maxPage.value = Math.ceil(res.data.result.total / formQuery.pageSize); const data = res.data.result.data; rows.value = data; + }) .catch((err) => { messageError($q, err); @@ -173,6 +174,7 @@ const dataRow = ref(); async function onClickSalary(type: string, data: Salary | null) { modalDialogFormMain.value = !modalDialogFormMain.value; typeAction.value = type; + if (data) { dataRow.value = data; }