diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 18431973d..94f0a224c 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -336,6 +336,8 @@ async function getTable() { bmaOfficerCheck: data.bmaOfficer, statusId: data.statusId, draft: convertDraft(data.draft), + isDraft: data.draft, + typeCommand: data.typeCommand, posTypeCandidateId: data.posTypeCandidateId, posTypeCandidateName: data.posTypeCandidateName, @@ -374,7 +376,7 @@ async function getTable() { const rowData = await (roleAdmin.value ? rowsAll.value - : rowsAll.value.filter((x: any) => x.statusId !== "DONE")); + : rowsAll.value.filter((x: any) => x.isDraft === true)); // รายชื่อทั้งหมด await filterpositionCandidate(rowData); @@ -779,7 +781,7 @@ async function onUpdateNewRows(type: string, pos: string) { const isStatusMatch = containStatus.value ? item.statusId === "DONE" - : item.statusId !== ""; + : item.statusId !== "DONE"; return isTypeMatch && isPositionMatch && isStatusMatch; }); @@ -1394,7 +1396,7 @@ onMounted(async () => { - +