From 52e9a326d927956619c987a4491bbd1543135b18 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 29 Jul 2025 15:19:38 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20=E0=B9=80=E0=B9=80=E0=B8=AA=E0=B8=94=E0=B8=87=20?= =?UTF-8?q?=E0=B8=94=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../06_retirement/components/DialogAddCommander.vue | 6 +++++- src/modules/17_acting/views/main.vue | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/components/DialogAddCommander.vue b/src/modules/06_retirement/components/DialogAddCommander.vue index 8feda4342..ce753a5ac 100644 --- a/src/modules/06_retirement/components/DialogAddCommander.vue +++ b/src/modules/06_retirement/components/DialogAddCommander.vue @@ -147,6 +147,9 @@ function onSubmit() { positionName: items.position, profileId: items.id, keycloakId: items.keycloakId, + ...(items.posExecutiveName + ? { PositionExecutiveName: items.posExecutiveName } + : {}), })); showLoader(); const profileSuffix = @@ -155,7 +158,8 @@ function onSubmit() { : "-employee"; const apiEndpoint = - routeName.value === "resignReject" || routeName.value === "resignRejectEMP" + routeName.value === "resignReject" || + routeName.value === "resignRejectEMP" ? config.API.addResignCancel( profileSuffix, props.type?.toLocaleLowerCase() as string, diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue index 7b2a402e0..ee3656f0b 100644 --- a/src/modules/17_acting/views/main.vue +++ b/src/modules/17_acting/views/main.vue @@ -502,6 +502,15 @@ onMounted(async () => {
{{ props.rowIndex + 1 }}
+
+ {{ props.row.posNo ? props.row.posNo : "-" }} + + +
{{ col.value ? col.value : "-" }}