diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue index 2aa65f1e8..3104f9c59 100644 --- a/src/modules/05_placement/components/AppointMent/Main.vue +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -91,7 +91,7 @@ const fecthlistappointment = async () => { rows.value = response.map((e: any) => ({ personalId: e.id, citizenId: e.citizenId, - fullname: e.firstname + " " + e.lastname, + fullname: e.prefix+e.firstname + " " + e.lastname, organizationName: e.organizationName + " " + @@ -105,7 +105,7 @@ const fecthlistappointment = async () => { positionNumber: e.positionNumber, positionPath: e.positionPath, status: status(e.status), - birthday: date2Thai(e.dateOfBirth), + birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth), })); // console.log(rows.value); rows2.value = rows.value.filter((e: any) => e.orgName !== null); @@ -172,7 +172,7 @@ const columns = ref([ align: "left", label: "เลขประจำตัวประชาชน", sortable: true, - field: "fullname", + field: "citizenId", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -230,7 +230,7 @@ const columns2 = ref([ align: "left", label: "เลขประจำตัวประชาชน", sortable: true, - field: "fullname", + field: "citizenId", headerStyle: "font-size: 14px", style: "font-size: 14px", }, diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue index 14eb38d5a..374cf980c 100644 --- a/src/modules/05_placement/components/Main.vue +++ b/src/modules/05_placement/components/Main.vue @@ -160,6 +160,10 @@ const fetchPlacementData = async (val: number) => { console.log(e); }) .finally(() => { + filterKeyword.value = ""; + examTime.value = "all" + examType.value = "all" + expiredAccount.value = false hideLoader(); }); }; @@ -183,7 +187,7 @@ const fetchYearOptions = async () => { }); }; const filterYear = () => { - console.log("searchYear", searchYear.value); + // console.log("searchYear", searchYear.value); fetchPlacementData(searchYear.value); }; diff --git a/src/modules/05_placement/components/PersonalList/TableDetail.vue b/src/modules/05_placement/components/PersonalList/TableDetail.vue index cdbea6068..c4942705d 100644 --- a/src/modules/05_placement/components/PersonalList/TableDetail.vue +++ b/src/modules/05_placement/components/PersonalList/TableDetail.vue @@ -334,19 +334,19 @@ const putpersonalForm = async () => { -
- + + - -
- + +