diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue index ed676f086..b38844a24 100644 --- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue +++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue @@ -168,11 +168,11 @@ async function fetchlistprofile(id: string) { prefix: e.prefix, firstName: e.firstName, lastName: e.lastName, - name: e.prefix + e.firstName + " " + e.lastName, + name: `${e.prefix}${e.firstName} ${e.lastName}`, organization: e.root, position: e.position, positionNumber: e.posNo, - positionType: e.posTypeName, + positionType: `${e.posTypeName} (${e.posLevelName})`, positionLevel: e.posLevelName, reason: e.reason, remove: e.remove, @@ -663,7 +663,13 @@ onMounted(async () => { >ลบข้อมูล - {{ props.row.order }} + + +
+ {{ col.value ? col.value : "-" }} +
+
+ - diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue index ec911e81d..c050970f9 100644 --- a/src/modules/06_retirement/components/02_resign/Table.vue +++ b/src/modules/06_retirement/components/02_resign/Table.vue @@ -377,7 +377,7 @@ onMounted(async () => { : '' " > - {{ col.value ? col.value : "" }} + {{ col.value ? col.value : "-" }} diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue index 5a3e7f973..1c73be261 100644 --- a/src/modules/06_retirement/components/03_resignEmp/Table.vue +++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue @@ -381,7 +381,7 @@ onMounted(async () => { : '' " > - {{ col.value ? col.value : "" }} + {{ col.value ? col.value : "-" }}