diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index fc7757095..4c1b74def 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -47,5 +47,5 @@ export default { // position placementPosition: () => `${placement}/position/use`, // putPositiom - putPosition: (id: string) => `${placement}/position/${id}`, + putPosition: (id:any) => `${placement}/position/${id}`, }; diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 38bc57323..d85c9247e 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -63,6 +63,16 @@ const visibleColumns = ref([ "draft", "positionCandidate", ]); +const visibleColumnslist = ref([ + "fullName", + "examNumber", + "idCard", + "positionNumber", + "organizationName", + "draft", + "bmaOfficer", + "positionCandidate", +]); const columns = ref([ { @@ -185,9 +195,9 @@ const convertContainStatus = (val: string) => { }; const convertDraft = (val: boolean) => { switch (val) { - case false: - return "รอส่งตัว"; case true: + return "รอส่งตัว"; + case false: return "ส่งตัวแล้ว"; default: return "-"; @@ -273,7 +283,7 @@ const saveDeferment = async () => { console.log("ยืนยันการขอผ่อนผัน"); await http .post(config.API.deferment(), formData) - .then((res) => { + .then(() => { success($q, "บันทึกสำเร็จ"); }) .catch((e) => { @@ -473,6 +483,8 @@ watch(containStatus, () => { const modaladdlist = ref(false); const selected = ref([]); const personal_selected = ref([]); +const filterlistAdd = ref(""); +const paging = ref(true); const savelist = () => { selected.value.map((e: any) => { personal_selected.value.push(e.personalId); @@ -486,21 +498,21 @@ const savelist = () => { flat: true, const: "negative", }, - }) - .onOk(async () => { - showLoader(); - await http.put(config.API.putPosition(examId), personal_selected.value); - }) - .then(() => { - success($q, "บันทึกสำเร็จ"); - }) - .catch(() => { - console.log(e); - }) - .finally(async () => { - await getTable(); - hideLoader(); - }); + }).onOk(async () => { + showLoader(); + await http + .put(config.API.putPosition(examId), personal_selected.value) + .then(() => { + success($q, "บันทึกสำเร็จ"); + }) + .catch((e: any) => { + console.log(e); + }) + .finally(async () => { + await getTable(); + hideLoader(); + }); + }); } }; const handleModalAddListUpdate = (val: boolean) => { @@ -512,6 +524,16 @@ const checkSelected = computed(() => { return true; } }); +const pagination = ref({ + sortBy: "fullname", + descending: true, + page: 1, + rowsPerPage: 10, +}); +const paginationLabel = (start: number, end: number, total: number) => { + if (paging.value == true) return " " + start + "-" + end + " ใน " + total; + else return start + "-" + end + " ใน " + total; +};