From 3709a71b646c5060e7ff77494ac5a7026f0786ca Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Sat, 29 Jun 2024 01:16:51 +0700 Subject: [PATCH] fixing --- .../05_placement/components/PersonalList/Table.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index c39128e8f..854586b78 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -339,10 +339,14 @@ async function getTable() { posLevelCandidateName: data.posLevelCandidateName, posmasterId: data.posmasterId, statusNameCheck: convertContainStatus(data.statusId), - deferment: data.deferment, + deferment: data.isRelief, statusName: - data.statusId == "CONTAIN" + data.isRelief === true && + data.statusId == "PREPARE-CONTAIN" && + data.node == null + ? "ขอผ่อนผัน" + : data.statusId == "CONTAIN" ? convertTypeCommand(data.typeCommand) + "แล้ว" : convertContainStatus(data.statusId) + (data.typeCommand != "" @@ -884,9 +888,7 @@ onMounted(async () => {