From 181a85384d35a1e3bff6d5bbe82e10a67f0d161e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 15:27:14 +0700 Subject: [PATCH 1/6] =?UTF-8?q?fix=20showSalary=20=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Step/Dialog2_Salary.vue | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/modules/18_command/components/Step/Dialog2_Salary.vue b/src/modules/18_command/components/Step/Dialog2_Salary.vue index c8a913f5c..0329e668d 100644 --- a/src/modules/18_command/components/Step/Dialog2_Salary.vue +++ b/src/modules/18_command/components/Step/Dialog2_Salary.vue @@ -48,29 +48,29 @@ function checkCommandSysId() { } } -const chechCommandCode = computed(() => { - const listCommandCode = [ - "C-PM-01", - "C-PM-02", - "C-PM-03", - "C-PM-04", - "C-PM-05", - "C-PM-07", - "C-PM-08", - "C-PM-09", - "C-PM-21", - "C-PM-22", - "C-PM-24", - "C-PM-29", - "C-PM-38", - "C-PM-39", - ]; - if (listCommandCode.includes(props.commandCode)) { - return true; - } else { - return false; - } -}); +// const chechCommandCode = computed(() => { +// const listCommandCode = [ +// "C-PM-01", +// "C-PM-02", +// "C-PM-03", +// "C-PM-04", +// "C-PM-05", +// "C-PM-07", +// "C-PM-08", +// "C-PM-09", +// "C-PM-21", +// "C-PM-22", +// "C-PM-24", +// "C-PM-29", +// "C-PM-38", +// "C-PM-39", +// ]; +// if (listCommandCode.includes(props.commandCode)) { +// return true; +// } else { +// return false; +// } +// }); function onSubmit() { dialogConfirm($q, () => { @@ -159,7 +159,7 @@ watch(
Date: Mon, 13 Jan 2025 17:06:48 +0700 Subject: [PATCH 2/6] fix reasonResign --- .../06_retirement/components/02_resign/ResignByid.vue | 5 +++-- .../06_retirement/components/03_resignEmp/ResignByid.vue | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue index 1e3e31f0d..b3cda9a01 100644 --- a/src/modules/06_retirement/components/02_resign/ResignByid.vue +++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue @@ -73,6 +73,7 @@ const dataDetail = ref({ statusMain: "", cancelReason: "", remark: "", + reasonResign: "", }); const workflowRef = ref(null); @@ -201,7 +202,7 @@ async function fetchData(id: string) { salary.value = data.salary ? data.salary : 0; date.value = data.sendDate ? new Date(data.sendDate) : null; dateLeave.value = data.activeDate ? new Date(data.activeDate) : null; - reason.value = data.reason ?? ""; + reason.value = data.reasonResign ?? ""; location.value = data.location ?? ""; status.value = data.status ?? ""; remarkHorizontal.value = data.remarkHorizontal ?? "-"; @@ -306,7 +307,7 @@ async function clickCancel() { salary.value = data.salary ? data.salary : 0; date.value = data.sendDate ? new Date(data.sendDate) : null; dateLeave.value = data.activeDate ? new Date(data.activeDate) : null; - reason.value = data.reason ?? ""; + reason.value = data.reasonResign ?? ""; location.value = data.location ?? ""; status.value = data.status ?? ""; remarkHorizontal.value = data.remarkHorizontal ?? "-"; diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue index b50a01b24..9c535a167 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue @@ -200,7 +200,7 @@ async function fetchData(id: string) { salary.value = data.salary ? data.salary : 0; date.value = data.sendDate ? new Date(data.sendDate) : null; dateLeave.value = data.activeDate ? new Date(data.activeDate) : null; - reason.value = data.reason ?? ""; + reason.value = data.reasonResign ?? ""; location.value = data.location ?? ""; status.value = data.status ?? ""; remarkHorizontal.value = data.remarkHorizontal ?? "-"; @@ -305,7 +305,7 @@ async function clickCancel() { salary.value = data.salary ? data.salary : 0; date.value = data.sendDate ? new Date(data.sendDate) : null; dateLeave.value = data.activeDate ? new Date(data.activeDate) : null; - reason.value = data.reason ?? ""; + reason.value = data.reasonResign ?? ""; location.value = data.location ?? ""; status.value = data.status ?? ""; remarkHorizontal.value = data.remarkHorizontal ?? "-"; From 74a4d948c700f59fb598efb5299fa78602da0482 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 17:07:23 +0700 Subject: [PATCH 3/6] no message --- src/modules/06_retirement/components/03_resignEmp/ResignByid.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue index 9c535a167..2af2f43b3 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue @@ -72,6 +72,7 @@ const dataDetail = ref({ statusMain: "", cancelReason: "", remark: "", + reasonResign: "", }); const workflowRef = ref(null); From 30b2525144f109626957ee22a708596517f2d5ad Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 17:23:04 +0700 Subject: [PATCH 4/6] fix reasonResign --- .../components/02_resign/DialogSendToCommand.vue | 4 +++- .../components/03_resignEmp/DialogSendToCommand.vue | 2 +- src/modules/06_retirement/interface/response/Main.ts | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue index 8d736d6aa..31a612835 100644 --- a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue +++ b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue @@ -25,7 +25,7 @@ const dataMapToSend = computed(() => { firstName: i.firstName, lastName: i.lastName, citizenId: i.citizenId, - remarkVertical: i.reason, + remarkVertical: i.reasonResign, remarkHorizontal: i.remarkHorizontal, })); }); @@ -158,6 +158,8 @@ const modalCommand = ref(false); /** popup ยืนยันส่งัว */ function saveOrder() { + console.log(selected.value); + dialogConfirm( $q, () => { diff --git a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue index e04ed5ea8..dc73d8fcc 100644 --- a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue +++ b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue @@ -25,7 +25,7 @@ const dataMapToSend = computed(() => { firstName: i.firstName, lastName: i.lastName, citizenId: i.citizenId, - remarkVertical: i.reason, + remarkVertical: i.reasonResign, remarkHorizontal: i.remarkHorizontal, })); }); diff --git a/src/modules/06_retirement/interface/response/Main.ts b/src/modules/06_retirement/interface/response/Main.ts index d1eb43a8e..e0252e9e8 100644 --- a/src/modules/06_retirement/interface/response/Main.ts +++ b/src/modules/06_retirement/interface/response/Main.ts @@ -29,6 +29,7 @@ interface ResponseItems { fullname: string; datetext: string | null; citizenId: string; + reasonResign: string; } interface TypeFile { From 1f63aa96865949f652d6598e12cbb39bd742facb Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 13 Jan 2025 18:06:30 +0700 Subject: [PATCH 5/6] fix salary --- src/modules/13_salary/views/04_salaryLists.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue index 54a5e1275..e3c706989 100644 --- a/src/modules/13_salary/views/04_salaryLists.vue +++ b/src/modules/13_salary/views/04_salaryLists.vue @@ -404,7 +404,12 @@ onMounted(async () => {
-
+
Date: Mon, 13 Jan 2025 18:06:45 +0700 Subject: [PATCH 6/6] fix salary emp --- src/modules/13_salary/views/05_salaryListsEmployee.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue index c9bb17d5a..18e375dc4 100644 --- a/src/modules/13_salary/views/05_salaryListsEmployee.vue +++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue @@ -395,7 +395,12 @@ onMounted(async () => {
-
+