Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2023-11-16 10:09:40 +07:00
commit e9b7cddf09

View file

@ -95,7 +95,7 @@ const rows = ref<TableRows[]>([]);
const keyword = ref<string>(""); const keyword = ref<string>("");
const page = ref<number>(1); const page = ref<number>(1);
const rowsPerPage = ref<number>(5); const rowsPerPage = ref<number>(5);
const maxPage = ref<number>(7 / 3); const maxPage = ref<number>(1);
/** เรียกข้อมูลรายการลงเวลาปฏิบัติงาน (รายการลงเวลา) */ /** เรียกข้อมูลรายการลงเวลาปฏิบัติงาน (รายการลงเวลา) */
async function fetchListLogRecord() { async function fetchListLogRecord() {
@ -109,8 +109,8 @@ async function fetchListLogRecord() {
}&pageSize=${rowsPerPage.value}&keyword=${keyword.value}` }&pageSize=${rowsPerPage.value}&keyword=${keyword.value}`
) )
.then((res) => { .then((res) => {
console.log(res); maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
let datalist: TableRows[] = res.data.result.map((e: DataResLog) => ({ let datalist: TableRows[] = res.data.result.data.map((e: DataResLog) => ({
id: e.id, id: e.id,
fullName: e.fullName, fullName: e.fullName,
checkDate: e.checkDate && date2Thai(e.checkDate), checkDate: e.checkDate && date2Thai(e.checkDate),
@ -127,6 +127,7 @@ async function fetchListLogRecord() {
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
rows.value = [];
}) })
.finally(() => { .finally(() => {
hideLoader(); hideLoader();