Merge branch 'develop' into devTee

This commit is contained in:
setthawutttty 2025-03-20 14:46:29 +07:00
commit da26ade47f

View file

@ -102,7 +102,9 @@ async function fetchListChart() {
await http await http
.get( .get(
config.API.salaryEmployeeChart + config.API.salaryEmployeeChart +
`?page=${formFilter.page}&pageSize=${formFilter.pageSize}&keyword=${formFilter.keyword.trim()}` `?page=${formFilter.page}&pageSize=${
formFilter.pageSize
}&keyword=${formFilter.keyword.trim()}`
) )
.then((res) => { .then((res) => {
rows.value = res.data.result.data; rows.value = res.data.result.data;
@ -269,7 +271,6 @@ onMounted(() => {
map-options map-options
:options="columns" :options="columns"
option-value="name" option-value="name"
style="min-width: 140px" style="min-width: 140px"
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
/> />
@ -326,7 +327,7 @@ onMounted(() => {
size="xs" size="xs"
name="mdi-format-list-bulleted-triangle" name="mdi-format-list-bulleted-triangle"
/> />
<div class="q-pl-md">ตราเงนเดอน</div> <div class="q-pl-md">ตราาจาง</div>
</div> </div>
</q-item-section> </q-item-section>
</q-item> </q-item>