Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m53s

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-05-08 11:01:50 +07:00
commit 4c7ab0f7e6

View file

@ -260,7 +260,6 @@ async function fetchData(loading: boolean = true) {
total.value = data.total; total.value = data.total;
maxPage.value = await Math.ceil(data.total / pageSize.value); maxPage.value = await Math.ceil(data.total / pageSize.value);
maxPage.value = maxPage.value < 1 ? 1 : maxPage.value; maxPage.value = maxPage.value < 1 ? 1 : maxPage.value;
rows.value = []; rows.value = [];
data.data.map((r: any) => { data.data.map((r: any) => {
rows.value.push({ rows.value.push({
@ -402,6 +401,7 @@ onMounted(async () => {
await fetchDataCom(); await fetchDataCom();
}); });
</script> </script>
<template> <template>
<div class="toptitle text-dark col-12 row items-center"> <div class="toptitle text-dark col-12 row items-center">
<q-btn <q-btn
@ -474,9 +474,9 @@ onMounted(async () => {
</div> </div>
</q-card> </q-card>
</q-slide-transition> </q-slide-transition>
<q-card flat bordered class="col-12 q-pt-sm"> <q-card flat bordered class="col-12 q-pt-sm">
<TableCandidate <TableCandidate
style="max-height: 80vh"
:rows="rows" :rows="rows"
:columns="columns" :columns="columns"
:filter="filter" :filter="filter"
@ -603,6 +603,7 @@ onMounted(async () => {
</template> </template>
</TableCandidate> </TableCandidate>
</q-card> </q-card>
<q-dialog v-model="modal" persistent> <q-dialog v-model="modal" persistent>
<q-card style="min-width: 600px"> <q-card style="min-width: 600px">
<q-card-section class="row items-center q-py-sm"> <q-card-section class="row items-center q-py-sm">