diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index d3d734485..ca3c259ba 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -157,18 +157,18 @@ const pagination = ref({ }); // ปิดโมเดล -function closeModal(){ +function closeModal() { modal.value = false; filterKeyword2.value = ""; -}; +} //reset filter -function resetFilter(){ +function resetFilter() { filterKeyword.value = ""; filterRef.value.focus(); -}; +} //เปิด Modal -async function openModalOrder(){ +async function openModalOrder() { openModal(); const row = await filters.value.filter( (r: ResponseItems) => @@ -182,10 +182,10 @@ async function openModalOrder(){ r.sendDate ); rows2.value = row; -}; +} //นำข้อมูลจาก API มาแสดง -async function fecthlist(){ +async function fecthlist() { showLoader(); await http .get(config.API.listResign()) @@ -199,6 +199,7 @@ async function fecthlist(){ r.createdAt == null ? "-" : date2Thai(new Date(r.createdAt)), activeDate: new Date(), createdAt: new Date(r.createdAt), + citizenId: r.citizenId, firstName: r.firstName ?? "", id: r.id ?? "", isActive: r.isActive ? r.isActive : false, @@ -228,7 +229,7 @@ async function fecthlist(){ .finally(() => { hideLoader(); }); -}; +} /**Hook */ onMounted(async () => { diff --git a/src/modules/06_retirement/interface/response/Main.ts b/src/modules/06_retirement/interface/response/Main.ts index 374c4b665..d1eb43a8e 100644 --- a/src/modules/06_retirement/interface/response/Main.ts +++ b/src/modules/06_retirement/interface/response/Main.ts @@ -28,6 +28,7 @@ interface ResponseItems { statustext: string; fullname: string; datetext: string | null; + citizenId: string; } interface TypeFile {